src/api/qualityManagement/nonconformingManagement.js

@@ -48,3 +48,12 @@
    data: query,
  });
}

// å–消隔离
export function liftTheQuarantineQualityUnqualified(query) {
  return request({
    url: "/quality/qualityUnqualified/liftTheQuarantine",
    method: "post",
    data: query,
  });
}

 src/views/productionManagement/productionProcess/index.vue

@@ -179,7 +179,7 @@
      width: 280,
      operation: [
        {
          name: "查看",
          name: "绑定生产记录",
          type: "text",
          clickFun: row => {
            showProcessParamModal(row);

 src/views/productionManagement/productionReporting/components/Detail.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
<script setup lang="ts">
import {computed} from "vue";

defineOptions({
  name: "ReportingDetail"
});

const props = defineProps({
  isShow: {
    type: Boolean,
    required: true
  },
  row: {
    type: Object,
    default: () => ({}),
  }
});

const emits = defineEmits(["update:isShow"]);

const visible = computed({
  get: () => props.isShow,
  set: (value: boolean) => emits("update:isShow", value),
});

</script>

<template>
  <el-dialog v-model="visible"
             :title="'详情'"
             width="90%">
    <el-descriptions title="报工详情">
      <el-descriptions-item label="报工单号">{{ row.productNo || '-' }}</el-descriptions-item>
      <el-descriptions-item label="报工人员">{{ row.nickName || '-' }}</el-descriptions-item>
      <el-descriptions-item label="工序">{{ row.process || '-' }}</el-descriptions-item>
      <el-descriptions-item label="工单编号">{{ row.workOrderNo || '-' }}</el-descriptions-item>
      <el-descriptions-item label="产品名称">{{ row.salesContractNo || '-' }}</el-descriptions-item>
      <el-descriptions-item label="产品规格型号">{{ row.productName || '-' }}</el-descriptions-item>
      <el-descriptions-item label="产出数量">{{ row.productModelName || '-' }}</el-descriptions-item>
      <el-descriptions-item label="报废数量">{{ row.quantity || '-' }}</el-descriptions-item>
      <el-descriptions-item label="单位">{{ row.scrapQty || '-' }}</el-descriptions-item>
      <el-descriptions-item label="创建时间">{{ row.createTime || '-' }}</el-descriptions-item>
    </el-descriptions>
    <template #footer>
        <span class="dialog-footer">
          <el-button @click="visible = false">关闭</el-button>
        </span>
    </template>
  </el-dialog>
</template>

<style scoped>
</style>

 src/views/productionManagement/productionReporting/index.vue

@@ -9,7 +9,7 @@
                    clearable
                    prefix-icon="Search"
                    style="width: 200px;"
                    @change="handleQuery" />
                    @change="handleQuery"/>
        </el-form-item>
        <el-form-item label="工单号:">
          <el-input v-model="searchForm.workOrderNo"
@@ -17,11 +17,12 @@
                    clearable
                    prefix-icon="Search"
                    style="width: 200px;"
                    @change="handleQuery" />
                    @change="handleQuery"/>
        </el-form-item>
        <el-form-item>
          <el-button type="primary"
                     @click="handleQuery">搜索</el-button>
                     @click="handleQuery">搜索
          </el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -43,6 +44,15 @@
                :tableLoading="tableLoading"
                @pagination="pagination"
                :total="page.total">
        <template #productNoSlot="{ row }">
          <el-button
              type="primary"
              link
              @click="openDetail(row)"
          >
            {{ row.productNo }}
          </el-button>
        </template>
        <template #expand="{ row }">
          <el-table :data="expandData"
                    border
@@ -52,7 +62,7 @@
            <el-table-column align="center"
                             label="序号"
                             type="index"
                             width="60" />
                             width="60"/>
            <el-table-column label="本次生产数量"
                             prop="finishedNum"
                             align="center"
@@ -66,7 +76,7 @@
                                 :precision="2"
                                 placeholder="请输入"
                                 clearable
                                 @change="changeNum(scope.row)" />
                                 @change="changeNum(scope.row)"/>
              </template>
            </el-table-column>
            <!--                        <el-table-column label="待生产数量" prop="pendingNum" width="240" align="center"></el-table-column>-->
@@ -81,7 +91,7 @@
                  <el-option v-for="user in userList"
                             :key="user.userId"
                             :label="user.nickName"
                             :value="user.userId" />
                             :value="user.userId"/>
                </el-select>
              </template>
            </el-table-column>
@@ -96,23 +106,25 @@
                                value-format="YYYY-MM-DD"
                                format="YYYY-MM-DD"
                                clearable
                                style="width: 100%" />
                                style="width: 100%"/>
              </template>
            </el-table-column>
            <el-table-column label="操作"
                             >
            >
              <template #default="scope">
                <el-button link
                           type="primary"
                           size="small"
                           @click="changeEditType(scope.row)"
                           v-if="!scope.row.editType"
                           :disabled="scope.row.parentStatus === 3">编辑</el-button>
                           :disabled="scope.row.parentStatus === 3">编辑
                </el-button>
                <el-button link
                           type="primary"
                           size="small"
                           @click="saveReceiptPayment(scope.row)"
                           v-if="scope.row.editType">保存</el-button>
                           v-if="scope.row.editType">保存
                </el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -123,298 +135,335 @@
              @close="handleQuery"></form-dia>
    <input-modal v-if="isShowInput"
                 v-model:visible="isShowInput"
                 :production-product-main-id="isShowingId" />
                 :production-product-main-id="isShowingId"/>
    <CopperPrintingForm
        v-if="copperPrintingFormVisible"
        v-model:isShow="copperPrintingFormVisible"
        :isEdit="false"
        :row="currentReportRowData"
        @refreshData="getList"/>
    <VoltageSortingForm
        v-if="voltageSortingFormVisible"
        v-model:isShow="voltageSortingFormVisible"
        :isEdit="false"
        :row="currentReportRowData"
        @refreshData="getList"/>
    <Detail
        v-if="showDetail"
        v-model:isShow="showDetail"
        :row="currentReportRowData"/>
  </div>
</template>

<script setup>
  import { onMounted, ref } from "vue";
  import FormDia from "@/views/productionManagement/productionReporting/components/formDia.vue";
  import { ElMessageBox } from "element-plus";
  import {
    productionReportUpdate,
    workListPageById,
    productionReportDelete,
  } from "@/api/productionManagement/productionReporting.js";
  import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js";
  import { userListNoPageByTenantId } from "@/api/system/user.js";
  import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
import {onMounted, ref} from "vue";
import FormDia from "@/views/productionManagement/productionReporting/components/formDia.vue";
import {ElMessageBox} from "element-plus";
import {
  productionReportUpdate,
  workListPageById,
  productionReportDelete,
} from "@/api/productionManagement/productionReporting.js";
import {productionProductMainListPage} from "@/api/productionManagement/productionProductMain.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
import VoltageSortingForm from "@/views/productionManagement/workOrder/components/VoltageSortingForm.vue";

  const data = reactive({
    searchForm: {
      nickName: "",
      workOrderNo: "",
      workOrderStatus: "",
    },
  });
  const { searchForm } = toRefs(data);
  const expandedRowKeys = ref([]);
  const expandData = ref([]);
  const userList = ref([]);
  const tableColumn = ref([
    {
      label: "报工单号",
      prop: "productNo",
      width: 120,
    },
    {
      label: "报工人员",
      prop: "nickName",
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
      width: 120,
    },
    {
      label: "工单编号",
      prop: "workOrderNo",
      width: 120,
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      width: 120,
    },
    {
      label: "产品名称",
      prop: "productName",
      width: 120,
    },
    {
      label: "产品规格型号",
      prop: "productModelName",
      width: 120,
    },
    {
      label: "产出数量",
      prop: "quantity",
      width: 120,
    },
    {
      label: "报废数量",
      prop: "scrapQty",
      width: 120,
    },
    {
      label: "单位",
      prop: "unit",
      width: 120,
    },
    
    {
      label: "创建时间",
      prop: "createTime",
      width: 120,
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
      fixed: "right",
      operation: [
        {
          name: "查看投入",
          type: "text",
          clickFun: row => {
            showInput(row);
          },
        },
        {
          name: "删除",
          type: "danger",
          clickFun: row => {
            deleteReport(row);
          },
        },
      ],
    },
  ]);
  const tableData = ref([]);
  const selectedRows = ref([]);
  const tableLoading = ref(false);
  const childrenLoading = ref(false);
  const page = reactive({
    current: 1,
    size: 100,
    total: 0,
  });
  const formDia = ref();
  const { proxy } = getCurrentInstance();
const CopperPrintingForm = defineAsyncComponent(() => import("@/views/productionManagement/workOrder/components/CopperPrintingForm.vue"));
const Detail = defineAsyncComponent(() => import("@/views/productionManagement/productionReporting/components/Detail.vue"));

  // æŸ¥è¯¢åˆ—表
  /** æœç´¢æŒ‰é’®æ“ä½œ */
  const handleQuery = () => {
    page.current = 1;
    getList();
  };
  const changeDaterange = value => {
    if (value) {
      searchForm.value.entryDateStart = value[0];
      searchForm.value.entryDateEnd = value[1];
    } else {
      searchForm.value.entryDateStart = undefined;
      searchForm.value.entryDateEnd = undefined;
    }
    handleQuery();
  };
  const deleteReport = row => {
    ElMessageBox.confirm("确定删除该报工吗？", "提示", {
      confirmButtonText: "确定",
      cancelButtonText: "取消",
      type: "warning",
    }).then(() => {
      productionReportDelete({ id: row.id }).then(res => {
        if (res.code === 200) {
          proxy.$modal.msgSuccess("删除成功");
          getList();
        } else {
          ElMessageBox.alert(res.msg || "删除失败", "提示", {
            confirmButtonText: "确定",
          });
        }
      });

const data = reactive({
  searchForm: {
    nickName: "",
    workOrderNo: "",
    workOrderStatus: "",
  },
});
const {searchForm} = toRefs(data);
const expandedRowKeys = ref([]);
const expandData = ref([]);
const userList = ref([]);
const tableColumn = ref([
  {
    label: "报工单号",
    prop: "productNo",
    width: 120,
    dataType: 'slot',
    slot: 'productNoSlot',
  },
  {
    label: "报工人员",
    prop: "nickName",
    width: 120,
  },
  {
    label: "工序",
    prop: "process",
    width: 120,
  },
  {
    label: "工单编号",
    prop: "workOrderNo",
    width: 120,
  },
  {
    label: "销售合同号",
    prop: "salesContractNo",
    width: 120,
  },
  {
    label: "产品名称",
    prop: "productName",
    width: 120,
  },
  {
    label: "产品规格型号",
    prop: "productModelName",
    width: 120,
  },
  {
    label: "产出数量",
    prop: "quantity",
    width: 120,
  },
  {
    label: "报废数量",
    prop: "scrapQty",
    width: 120,
  },
  {
    label: "单位",
    prop: "unit",
    width: 120,
  },

  {
    label: "创建时间",
    prop: "createTime",
    width: 120,
  },
  {
    dataType: "action",
    label: "操作",
    align: "center",
    fixed: "right",
    operation: [
      {
        name: "查看投入",
        type: "text",
        clickFun: row => {
          showInput(row);
        },
      },
      {
        name: "删除",
        type: "danger",
        clickFun: row => {
          deleteReport(row);
        },
      },
    ],
  },
]);
const currentReportRowData = ref({});
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const childrenLoading = ref(false);
const page = reactive({
  current: 1,
  size: 100,
  total: 0,
});
const formDia = ref();
const {proxy} = getCurrentInstance();

// æŸ¥è¯¢åˆ—表
/** æœç´¢æŒ‰é’®æ“ä½œ */
const handleQuery = () => {
  page.current = 1;
  getList();
};
const changeDaterange = value => {
  if (value) {
    searchForm.value.entryDateStart = value[0];
    searchForm.value.entryDateEnd = value[1];
  } else {
    searchForm.value.entryDateStart = undefined;
    searchForm.value.entryDateEnd = undefined;
  }
  handleQuery();
};
const deleteReport = row => {
  ElMessageBox.confirm("确定删除该报工吗？", "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  }).then(() => {
    productionReportDelete({id: row.id}).then(res => {
      if (res.code === 200) {
        proxy.$modal.msgSuccess("删除成功");
        getList();
      } else {
        ElMessageBox.alert(res.msg || "删除失败", "提示", {
          confirmButtonText: "确定",
        });
      }
    });
  };
  const pagination = obj => {
    page.current = obj.page;
    page.size = obj.limit;
    getList();
  };
  const getList = () => {
    tableLoading.value = true;
    const params = { ...searchForm.value, ...page };
    params.entryDate = undefined;
    expandedRowKeys.value = [];
    productionProductMainListPage(params)
  });
};
const pagination = obj => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
};
const getList = () => {
  tableLoading.value = true;
  const params = {...searchForm.value, ...page};
  params.entryDate = undefined;
  expandedRowKeys.value = [];
  productionProductMainListPage(params)
      .then(res => {
        tableLoading.value = false;
        tableData.value = res.data.records.map(item => ({
          ...item,
          pendingFinishNum:
            (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
              (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
        }));
        page.total = res.data.total;
      })
      .catch(err => {
        tableLoading.value = false;
      });
  };
  // å±•å¼€è¡Œ
  const expandChange = (row, expandedRows) => {
    userListNoPageByTenantId().then(res => {
      userList.value = res.data;
    });
    if (expandedRows.length > 0) {
      nextTick(() => {
        expandedRowKeys.value = [];
        try {
          childrenLoading.value = true;
          workListPageById({ id: row.id }).then(res => {
            childrenLoading.value = false;
            const index = tableData.value.findIndex(item => item.id === row.id);
            if (index > -1) {
              expandData.value = res.data.map(item => ({
                ...item,
                pendingNum:
};
// å±•å¼€è¡Œ
const expandChange = (row, expandedRows) => {
  userListNoPageByTenantId().then(res => {
    userList.value = res.data;
  });
  if (expandedRows.length > 0) {
    nextTick(() => {
      expandedRowKeys.value = [];
      try {
        childrenLoading.value = true;
        workListPageById({id: row.id}).then(res => {
          childrenLoading.value = false;
          const index = tableData.value.findIndex(item => item.id === row.id);
          if (index > -1) {
            expandData.value = res.data.map(item => ({
              ...item,
              pendingNum:
                  (Number(item.schedulingNum) || 0) -
                  (Number(item.finishedNum) || 0),
                parentStatus: row.status, // æ–°å¢žçˆ¶è¡¨çŠ¶æ€
              }));
            }
            expandedRowKeys.value.push(row.id);
          });
        } catch (error) {
          childrenLoading.value = false;
          console.log(error);
        }
      });
    } else {
      expandedRowKeys.value = [];
    }
  };
  const changeNum = row => {
    // æ‰¾åˆ°çˆ¶è¡¨æ ¼æ•°æ®
    const parentRow = tableData.value.find(
              parentStatus: row.status, // æ–°å¢žçˆ¶è¡¨çŠ¶æ€
            }));
          }
          expandedRowKeys.value.push(row.id);
        });
      } catch (error) {
        childrenLoading.value = false;
        console.log(error);
      }
    });
  } else {
    expandedRowKeys.value = [];
  }
};
const changeNum = row => {
  // æ‰¾åˆ°çˆ¶è¡¨æ ¼æ•°æ®
  const parentRow = tableData.value.find(
      item => item.id === expandedRowKeys.value[0]
    );
    // è®¡ç®—所有子表格 finishedNum çš„总和
    const totalFinishedNum = expandData.value.reduce(
  );
  // è®¡ç®—所有子表格 finishedNum çš„总和
  const totalFinishedNum = expandData.value.reduce(
      (sum, item) => sum + (Number(item.finishedNum) || 0),
      0
    );
    // çˆ¶è¡¨æ ¼çš„排产数量
    const schedulingNum = parentRow ? Number(parentRow.schedulingNum) : 0;
  );
  // çˆ¶è¡¨æ ¼çš„排产数量
  const schedulingNum = parentRow ? Number(parentRow.schedulingNum) : 0;

    if (totalFinishedNum > schedulingNum) {
      // å›žé€€æœ¬æ¬¡è¾“å…¥
      row.finishedNum =
  if (totalFinishedNum > schedulingNum) {
    // å›žé€€æœ¬æ¬¡è¾“å…¥
    row.finishedNum =
        schedulingNum - (totalFinishedNum - Number(row.finishedNum));
      proxy.$modal.msgWarning("所有本次生产数量之和不可大于排产数量");
    }
    row.pendingNum = row.schedulingNum - row.finishedNum;
  };
  // ç¼–辑修改状态
  const changeEditType = row => {
    proxy.$modal.msgWarning("所有本次生产数量之和不可大于排产数量");
  }
  row.pendingNum = row.schedulingNum - row.finishedNum;
};
// ç¼–辑修改状态
const changeEditType = row => {
  row.editType = !row.editType;
};
// ä¿å­˜è®°å½•
const saveReceiptPayment = row => {
  productionReportUpdate(row).then(res => {
    row.editType = !row.editType;
  };
  // ä¿å­˜è®°å½•
  const saveReceiptPayment = row => {
    productionReportUpdate(row).then(res => {
      row.editType = !row.editType;
      getList();
      proxy.$modal.msgSuccess("提交成功");
    });
  };
  // è¡¨æ ¼é€‰æ‹©æ•°æ®
  const handleSelectionChange = selection => {
    selectedRows.value = selection;
  };
  const summarizeMainTable = param => {
    return proxy.summarizeTable(param, ["finishedNum"]);
  };
  // æ‰“开弹框
  const openForm = (type, row) => {
    if (selectedRows.value.length !== 1) {
      proxy.$message.error("请选择一条数据");
      return;
    }
    if (selectedRows.value[0].pendingFinishNum == 0) {
      proxy.$message.warning("无需再报工");
      return;
    }
    nextTick(() => {
      const rowInfo = type === "add" ? selectedRows.value[0] : row;
      formDia.value?.openDialog(type, rowInfo);
    });
  };
    getList();
    proxy.$modal.msgSuccess("提交成功");
  });
};
// è¡¨æ ¼é€‰æ‹©æ•°æ®
const handleSelectionChange = selection => {
  selectedRows.value = selection;
};
const summarizeMainTable = param => {
  return proxy.summarizeTable(param, ["finishedNum"]);
};
// æ‰“开弹框
const openForm = (type, row) => {
  if (selectedRows.value.length !== 1) {
    proxy.$message.error("请选择一条数据");
    return;
  }
  if (selectedRows.value[0].pendingFinishNum == 0) {
    proxy.$message.warning("无需再报工");
    return;
  }
  nextTick(() => {
    const rowInfo = type === "add" ? selectedRows.value[0] : row;
    formDia.value?.openDialog(type, rowInfo);
  });
};

  // æ‰“开投入模态框
  const isShowInput = ref(false);
  const isShowingId = ref(0);
  const showInput = row => {
    isShowInput.value = true;
    isShowingId.value = row.id;
  };
// æ‰“开投入模态框
const isShowInput = ref(false);
const copperPrintingFormVisible = ref(false);
const voltageSortingFormVisible = ref(false);
const showDetail = ref(false);
const isShowingId = ref(0);
const showInput = row => {
  isShowInput.value = true;
  isShowingId.value = row.id;
};

  // å¯¼å‡º
  const handleOut = () => {
    ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
    })
// å¯¼å‡º
const handleOut = () => {
  ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {
    confirmButtonText: "确认",
    cancelButtonText: "取消",
    type: "warning",
  })
      .then(() => {
        proxy.download("/productionProductMain/export", {}, "生产报工.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
  };
  onMounted(() => {
    getList();
  });
};
const openDetail = row => {
  currentReportRowData.value = row;
  if (row.process ==='印铜' || row.process ==='印银') {
    copperPrintingFormVisible.value = true;
  } else if (row.process === '电压分选') {
    voltageSortingFormVisible.value = true;
  } else {
    showDetail.value = true;
  }
};
onMounted(() => {
  getList();
});
</script>

<style scoped></style>

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

@@ -18,10 +18,6 @@
    type: Boolean,
    default: false
  },
  detailData: {
    type: Object,
    default: () => ({}),
  },
  row: {
    type: Object,
    default: () => ({}),
@@ -150,8 +146,8 @@

const initData = () => {
  if (!props.isEdit) {
    formData.otherData = JSON.parse(props.detailData.otherData || '{}');
    formData.quantity = props.detailData.quantity;
    formData.otherData = JSON.parse(props.row.otherData || '{}');
    formData.quantity = props.row.quantity;
  } else {
    const row = props.row;
    formData.planQuantity = row.planQuantity
@@ -174,7 +170,7 @@

<template>
  <el-dialog v-model="visible"
             title="印铜报工"
             :title="isEdit? '印铜报工' : '详情'"
             width="90%">
    <el-form :model="formData">
      <table class="report-table">

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,341 @@
<script setup lang="ts">
import {computed, onMounted, reactive, ref} from "vue";
import dayjs from "dayjs";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {ElMessage} from "element-plus";
import {addProductMain} from "@/api/productionManagement/workOrder.js";

defineOptions({
  name: "VoltageSortingForm"
});

const props = defineProps({
  isShow: {
    type: Boolean,
    required: true
  },
  isEdit: {
    type: Boolean,
    default: false
  },
  row: {
    type: Object,
    default: () => ({}),
  }
});

const emits = defineEmits(["update:isShow", "refreshData"]);

const visible = computed({
  get: () => props.isShow,
  set: (value: boolean) => emits("update:isShow", value),
});

const formData = reactive({
  productProcessRouteItemId: undefined,
  workOrderId: undefined,
  planQuantity: undefined,
  reportWork: undefined,
  productMainId: undefined,
  quantity: undefined, // äº§å‡ºæ•°é‡
  userId: undefined, // ä½œä¸šå‘˜
  userName: undefined, // ä½œä¸šå‘˜
  scrapQty: undefined, // ä¸è‰¯æ•°é‡
  otherData: {
    engineException: undefined,// æœ‰æ— å·¥ç¨‹å¼‚常
    specificIssue: undefined,// å…·ä½“不良
    dryingTemperature: '', // çƒ˜å¹²æ¸©åº¦
    scrapingDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // åˆ®é‡æ—¥æœŸ
    machineNumber: undefined, // æœºå°å·
    receiveQuantity: undefined, // æŽ¥æ”¶æ•°é‡
    voltageSpecs: [], // ç”µåŽ‹è§„æ ¼,
    voltage: [], // ç”µåŽ‹
    quantity: [], // æ•°é‡
    comprehensiveHit: undefined, // ç»¼åˆå‘½ä¸­æœ¬
    userId: undefined, // ä½œä¸šå‘˜
    userName: undefined, // ä½œä¸šå‘˜
    exceptionDealResult: undefined, // å¼‚常处理结果
  }
})

const userOptions = ref([]);
const getUserList = () => {
  userListNoPageByTenantId()
      .then(res => {
        if (res.code === 200) {
          userOptions.value = res.data || [];
        }
      })
      .catch(err => {
        console.error("获取用户列表失败", err);
      });
};
// ç”¨æˆ·é€‰æ‹©å˜åŒ–时更新 userName
const handleUserChange = (value) => {
  if (value) {
    formData.userName = userOptions.value.find(user => user.userId === value).userName;
  }
};
const handleReport = () => {
  if (!formData.userId) {
    ElMessage.error('请选择作业员')
    return;
  }
  if (!formData.quantity || formData.quantity <= 0) {
    ElMessage.error('请输入产出数量')
    return;
  }

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

  addProductMain(submitData).then(res => {
    if (res.code === 200) {
      ElMessage({
        message: '报工成功',
        type: 'success',
      })
      emits("refreshData")
      visible.value = false;
    } else {
      ElMessage.error('报工失败')
    }
  });
};

const initData = () => {
  if (!props.isEdit) {
    formData.otherData = JSON.parse(props.row.otherData || '{}');
    formData.quantity = props.row.quantity;
  } else {
    const row = props.row;
    formData.planQuantity = row.planQuantity
    formData.productProcessRouteItemId = row.productProcessRouteItemId
    formData.workOrderId = row.id
    formData.reportWork = row.reportWork
    formData.productMainId = row.productMainId
  }
}

const displayValue = (value: any) => {
  return value === undefined || value === null || value === "" ? "-" : value;
};

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

<template>
  <el-dialog v-model="visible"
             :title="isEdit? '电压分选报工' : '详情'"
             width="90%">
    <el-form :model="formData">
      <table class="report-table">
        <tbody>
        <tr>
          <td class="tip" colspan="12">电压分选情况</td>
          <td class="label" colspan="2">刮量日期</td>
          <td colspan="2">
            <el-date-picker
                v-if="props.isEdit"
                v-model="formData.otherData.scrapingDate"
                type="datetime"
                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.scrapingDate) }}</span>
          </td>
          <td class="label" colspan="2">机台号</td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.machineNumber" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.machineNumber) }}</span>
          </td>
          <td class="label" colspan="3">作业员</td>
        </tr>
        <tr>
          <td class="label" colspan="2">档位</td>
          <td class="label" colspan="2">一档</td>
          <td class="label" colspan="2">二档</td>
          <td class="label" colspan="2">三档</td>
          <td class="label" colspan="2">四档</td>
          <td class="label" colspan="2">五档</td>
          <td class="label" colspan="2">接收数量</td>
          <td colspan="6">
            <el-input-number v-if="props.isEdit" v-model="formData.otherData.receiveQuantity" controls-position="right" style="width: 100%;" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.receiveQuantity) }}</span>
          </td>
          <td rowspan="6" colspan="3">
            <el-select v-model="formData.userId"
                       v-if="props.isEdit"
                       style="width: 100%"
                       placeholder="请选择作业员"
                       clearable
                       filterable
                       @change="handleUserChange">
              <el-option v-for="user in userOptions"
                         :key="user.userId"
                         :label="user.userName"
                         :value="user.userId"/>
            </el-select>
            <span v-else class="view-value">{{ displayValue(formData.userName || formData.userId) }}</span>
          </td>
        </tr>
        <tr>
          <td class="label" colspan="2">电压规格</td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltageSpecs[0]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltageSpecs[0]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltageSpecs[1]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltageSpecs[1]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltageSpecs[2]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltageSpecs[2]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltageSpecs[3]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltageSpecs[3]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltageSpecs[4]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltageSpecs[4]) }}</span>
          </td>
          <td class="label" colspan="2">产出数量</td>
          <td colspan="6">
            <el-input-number v-if="props.isEdit" controls-position="right" v-model="formData.quantity" style="width: 100%;" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.quantity) }}</span>
          </td>
        </tr>
        <tr>
          <td class="label" colspan="2">电压</td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltage[0]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltage[0]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltage[1]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltage[1]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltage[2]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltage[2]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltage[3]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltage[3]) }}</span>
          </td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.voltage[4]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.voltage[4]) }}</span>
          </td>
          <td class="label" colspan="2">不良数量</td>
          <td colspan="6">
            <el-input-number v-if="props.isEdit" controls-position="right" v-model="formData.scrapQty" style="width: 100%;" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.scrapQty) }}</span>
          </td>
        </tr>
        <tr>
          <td class="label" colspan="2">数量</td>
          <td colspan="2">
            <el-input-number v-if="props.isEdit" controls-position="right" v-model="formData.otherData.quantity[0]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.quantity[0]) }}</span>
          </td>
          <td colspan="2">
            <el-input-number v-if="props.isEdit" controls-position="right" v-model="formData.otherData.quantity[1]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.quantity[1]) }}</span>
          </td>
          <td colspan="2">
            <el-input-number v-if="props.isEdit" controls-position="right" v-model="formData.otherData.quantity[2]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.quantity[2]) }}</span>
          </td>
          <td colspan="2">
            <el-input-number v-if="props.isEdit" controls-position="right" v-model="formData.otherData.quantity[3]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.quantity[3]) }}</span>
          </td>
          <td colspan="2">
            <el-input-number v-if="props.isEdit" controls-position="right" v-model="formData.otherData.quantity[4]" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.quantity[4]) }}</span>
          </td>
          <td class="label" colspan="2">综合命中本</td>
          <td colspan="6">
            <el-input v-if="props.isEdit" v-model="formData.otherData.comprehensiveHit" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.comprehensiveHit) }}</span>
          </td>
        </tr>
        <tr>
          <td class="label" colspan="2">有无工程异常</td>
          <td colspan="10">
            <div v-if="props.isEdit" style="display: flex; align-items: center; width: 100%;">
              <el-radio-group v-model="formData.otherData.engineException" style="display: flex; margin-right: 20px;">
                <el-radio value="无">无</el-radio>
                <el-radio value="有">有</el-radio>
              </el-radio-group>
              <div v-if="formData.otherData.engineException === '有'" style="display: flex; align-items: center; flex: 1;">
                <div style="width: 100px;">具体不良：</div>
                <el-input v-model="formData.otherData.specificIssue" placeholder="请输入" style="width: 100%;"/>
              </div>
            </div>
            <span v-else class="view-value">{{ displayValue(formData.otherData.specificIssue) }}</span>
          </td>
          <td class="label" colspan="2">异常处理结果</td>
          <td colspan="6">
            <el-input v-if="props.isEdit" v-model="formData.otherData.exceptionDealResult" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.exceptionDealResult) }}</span>
          </td>
        </tr>
        </tbody>
      </table>
    </el-form>
    <template #footer>
        <span class="dialog-footer">
          <el-button v-if="props.isEdit" type="primary"
                     @click="handleReport">确定</el-button>
          <el-button @click="visible = false">{{ props.isEdit ? "取消" : "关闭" }}</el-button>
        </span>
    </template>
  </el-dialog>
</template>

<style scoped>
.report-table {
  width: 100%;
  border-collapse: collapse;
  table-layout: fixed;
  font-size: 13px;
}

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

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

.report-table .tip {
  text-align: center;
  font-weight: 500;
  line-height: 1.4;
  background: #fafafa;
}

.view-value {
  display: inline-block;
  min-height: 32px;
  line-height: 32px;
}
</style>

 src/views/productionManagement/workOrder/index.vue

@@ -227,6 +227,12 @@
        :isEdit="true"
        :row="currentReportRowData"
        @refreshData="getList"/>
    <VoltageSortingForm
        v-if="voltageSortingFormVisible"
        v-model:isShow="voltageSortingFormVisible"
        :isEdit="true"
        :row="currentReportRowData"
        @refreshData="getList"/>
  </div>
</template>

@@ -249,6 +255,7 @@
const {priority_type} = proxy.useDict("priority_type");

const CopperPrintingForm = defineAsyncComponent(() => import("./components/CopperPrintingForm.vue"));
const VoltageSortingForm = defineAsyncComponent(() => import("./components/VoltageSortingForm.vue"));
const tableColumn = ref([
  {
    label: "优先级",
@@ -364,7 +371,7 @@
        clickFun: row => {
          showReportDialog(row);
        },
        disabled: row => row.planQuantity <= 0,
        disabled: row => !row.isCanReport || row.planQuantity <= 0,
      },
    ],
  },
@@ -375,6 +382,7 @@
const qrRowData = ref(null);
const editDialogVisible = ref(false);
const copperPrintingFormVisible = ref(false);
const voltageSortingFormVisible = ref(false);
const transferCardVisible = ref(false);
const transferCardData = ref([]);
const transferCardQrUrl = ref("");
@@ -625,10 +633,14 @@

const showReportDialog = row => {
  currentReportRowData.value = row;
  if (row.processName === '印铜') {
  if (row.processName === '印铜' || row.processName === '印银') {
    copperPrintingFormVisible.value = true
    return
  }
  if (row.processName === '电压分选') {
    voltageSortingFormVisible.value = true
    return;
  }
  reportForm.planQuantity = row.planQuantity;
  reportForm.quantity = row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
  reportForm.productProcessRouteItemId = row.productProcessRouteItemId;

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

@@ -49,6 +49,11 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量：" prop="quantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable :precision="2" :disabled="quantityDisabled"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
@@ -57,8 +62,10 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量：" prop="quantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable :precision="2" :disabled="quantityDisabled"/>
            <el-form-item label="不良原因：" prop="defectiveReason">
              <el-select v-model="form.defectiveReason" placeholder="请选择" clearable style="width: 100%">
                <el-option :label="item.label" :value="item.value" v-for="(item,index) in defective_reason" :key="index" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
@@ -145,6 +152,7 @@
    productModelId: "",
    model: "",
    testStandardId: "",
    defectiveReason: undefined,
    unit: "",
    quantity: "",
    checkCompany: "",
@@ -171,6 +179,7 @@
});
const supplierList = ref([]);
const productOptions = ref([]);
const { defective_reason } = proxy.useDict("defective_reason");
const tableColumn = ref([
    {
        label: "指标",

 src/views/qualityManagement/finalInspection/index.vue

@@ -19,7 +19,7 @@
        >
      </div>
      <div>
        <el-button type="primary" @click="openForm('add')">新增</el-button>
<!--        <el-button type="primary" @click="openForm('add')">新增</el-button>-->
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
@@ -122,6 +122,16 @@
    width: 100
  },
  {
    label: "不良数量",
    prop: "defectiveQuantity",
    width: 100
  },
  {
    label: "不良原因",
    prop: "defectiveReason",
    width: 100
  },
  {
    label: "检测单位",
    prop: "checkCompany",
    width: 120

 src/views/qualityManagement/metricMaintenance/StandardFormDialog.vue

@@ -22,9 +22,9 @@
      </el-form-item>
      <el-form-item label="类别" prop="inspectType">
        <el-select v-model="form.inspectType" placeholder="请选择类别" style="width: 100%">
          <el-option label="原材料检验" value="0" />
<!--          <el-option label="原材料检验" value="0" />-->
          <el-option label="过程检验" value="1" />
          <el-option label="出厂检验" value="2" />
          <el-option label="成品检验" value="2" />
          <el-option label="巡检" value="3" />
        </el-select>
      </el-form-item>

 src/views/qualityManagement/metricMaintenance/index.vue

@@ -304,7 +304,7 @@
      const map = {
        0: '原材料检验',
        1: '过程检验',
        2: '出厂检验'
        2: '成品检验'
      }
      return map[val] || val
    }

 src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue

@@ -13,7 +13,7 @@
              <el-select v-model="form.inspectType" disabled>
                <el-option label="原材料检验" :value="0" />
                <el-option label="过程检验" :value="1" />
                <el-option label="出厂检验" :value="2" />
                <el-option label="成品检验" :value="2" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -82,7 +82,7 @@
          <el-col :span="12">
            <el-form-item label="处理结果：" prop="dealResult">
              <el-select v-model="form.dealResult" placeholder="请选择" clearable>
                <el-option :label="item.label" :value="item.value" v-for="item in filteredRejectionHandling" :key="item.value" />
                <el-option :label="item.label" :value="item.value" v-for="item in filteredRejectionHandling" :key="item.value" :disabled="form.process === '印铜' && item.value !== '报废'" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -109,6 +109,13 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30" v-if="form.dealResult === '隔离'">
          <el-col :span="12">
            <el-form-item label="备注：" prop="remark">
              <el-input type="textarea"  v-model="form.remark" :rows="3" placeholder="请输入"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
@@ -121,7 +128,7 @@
</template>

<script setup>
import {ref, reactive, toRefs, computed} from "vue";
import {ref, reactive, toRefs, computed, watch} from "vue";
import {productTreeList} from "@/api/basicData/product.js";
import {
  getQualityUnqualifiedInfo,
@@ -151,7 +158,8 @@
    dealResult: '',
    dealName: '',
    dealTime: '',
    method: undefined
    method: undefined,
    remark: undefined
  },
  rules: {
    checkTime: [{ required: false, message: "请输入", trigger: "blur" },],
@@ -181,6 +189,11 @@
  return data
})

watch(() => form.value.dealResult, (newVal) => {
  if (newVal !== '隔离') {
    form.value.remark = undefined;
  }
});

// æ‰“开弹框
const openDialog = async (type, row) => {

 src/views/qualityManagement/nonconformingManagement/index.vue

@@ -63,7 +63,7 @@
import {onMounted, ref, reactive, toRefs, nextTick, getCurrentInstance} from "vue";
import FormDia from "@/views/qualityManagement/nonconformingManagement/components/formDia.vue";
import {ElMessageBox} from "element-plus";
import {qualityUnqualifiedDel, qualityUnqualifiedListPage} from "@/api/qualityManagement/nonconformingManagement.js";
import {qualityUnqualifiedDel, qualityUnqualifiedListPage, liftTheQuarantineQualityUnqualified} from "@/api/qualityManagement/nonconformingManagement.js";
import InspectionFormDia from "@/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue";
import dayjs from "dayjs";

@@ -180,6 +180,14 @@
    width: 100,
    operation: [
      {
        name: "取消隔离",
        type: "text",
        clickFun: (row) => {
          liftTheQuarantine(row);
        },
        showHide: (row) => row.dealResult === '隔离' && !row.quarantineLifted
      },
      {
        name: "处理",
        type: "text",
        clickFun: (row) => {
@@ -260,6 +268,14 @@
  })
};

const liftTheQuarantine = (row) => {
  proxy.$modal.confirm("是否确认取消隔离?").then(function () {
    return liftTheQuarantineQualityUnqualified(row)
  }).then(() => {
    proxy.$modal.msgSuccess("取消隔离成功");
    getList();
  }).catch(() => {})
}
// åˆ é™¤
const handleDelete = () => {
  let ids = [];