spring
2025-04-10 dab59f7624a2fb8d4114bb67b554ff09d91f810c
Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
已修改2个文件
11 ■■■■ 文件已修改
src/api/business/rawMaterialOrder.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/components/InspectionWord.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/business/rawMaterialOrder.js
@@ -291,8 +291,8 @@
export function saveUnqualifiedContext(query) {
  return request({
    url: "/insOrderPlan/saveUnqualifiedContext",
    method: "delete",
    params: query,
    method: "post",
    data: query,
  });
}
src/views/business/inspectionTask/components/InspectionWord.vue
@@ -246,12 +246,13 @@
import AddUnPass from "@/views/business/unpass/components/addUnPass.vue";
import {
  checkSubmitPlan,
  determineWhetherToCollectData,
  doInsOrder, downFile,
  getInsProductUnqualifiedRetest,
  search, selectUserCondition,
  submitPlan,
  verifyPlan
} from "@/api/business/inspectionTask";
} from '@/api/business/inspectionTask'
import { getUserNow, saveUnqualifiedContext } from "@/api/business/rawMaterialOrder";
export default {
  props: ['sonLaboratory', 'orderId', 'state', 'inspectorList', 'typeSource', 'unPassCheck', 'rawMaterialTag'],
@@ -847,7 +848,7 @@
        retestTag: this.retestTag,
        rawMaterialTag: this.rawMaterialTag,
      }
      let res = getInsProductUnqualifiedRetest(params)
      let res = await getInsProductUnqualifiedRetest(params)
      if (res.code === 200 && res.data.length > 0) {
        this.tableLoading = false;
        this.scrollInit()
@@ -1281,7 +1282,7 @@
          }
        })
        // 以下是样式处理逻辑
        set = Array.sort(set)
        // set = Array.sort(set)
        set.forEach(b => {
          let arr = []
          a.template.forEach(c => {