检验任务数据分类查询问题修复

zouyu

6 天以前 d2e867966539004b6b5a73ae3566a659ac6f8b6d

检验任务数据分类查询问题修复

 src/views/business/inspectionReview/index.vue

@@ -105,10 +105,12 @@
          width: "100px",
          dataType: "tag",
          formatData: (params) => {
            if (params == 0 ) {
              return "成品下单";
            } else {
            if (params == 0) {
              return "外购下单";
            } else if(params==1) {
              return "原材料下单";
            }else{
              return "委托下单";
            }
          },
        },
@@ -247,7 +249,7 @@
      sonLaboratoryList: [],
      typeSourceList: [
        { label: '委托下单', value: -1 },
        { label: '成品下单', value: 0 },
        { label: '外购下单', value: 0 },
        { label: '原材料下单', value: 1 },
      ],
      isCopper: null,

 src/views/business/inspectionTask/index.vue

@@ -283,9 +283,9 @@
      },
      claimVisible: false,
      tabList: [
        { label: "委托", value: 0 },
        { label: "委托", value: -1 },
        { label: "原材料", value: 1 },
        { label: "外购", value: 2 },
        { label: "外购", value: 0 },
      ],
      active: 1,
      tabIndex: 0,
@@ -293,7 +293,7 @@
      planTotal: 0,
      insStateList: [],
      state: 0, // 0:台账页，1：检验页面,2检验页面(复核)，默认为0,3数据查看
      typeSource: null, // 0:成品下单，1：原材料下单
      typeSource: -1, // 0:外购成品下单，1：原材料下单
      sonLaboratory: null, // 0:委托，1：原材料
      activeFace: 0, // 1：下单，2：查看，3：审核，默认为0
      currentId: null,
@@ -369,9 +369,11 @@
          dataType: "tag",
          formatData: (params) => {
            if (params == 0) {
              return "成品下单";
            } else {
              return "外购下单";
            } else if(params==1) {
              return "原材料下单";
            }else{
              return "委托下单";
            }
          },
        },
@@ -558,6 +560,7 @@
  mounted() {
    this.getAuthorizedPerson();
    this.queryParams.userId = this.userId;
    this.queryParams.typeSource = this.typeSource
    this.currentTime = getYearAndMonthAndDays();
    this.getDicts("urgency_level").then((response) => {
      this.urgencyLevel = this.dictToValue(response.data);
@@ -576,6 +579,7 @@
    this.getDicts("inspection_task_state").then((response) => {
      this.inspectionTaskState = this.dictToValue(response.data);
    });
    this.queryParams.typeSource = this.typeSource
    this.refreshTable();
  },
  methods: {
@@ -648,14 +652,8 @@
    },
    refreshTable(e) {
      this.page.current = 1;
      let typeSource = null;
      if(this.tabIndex===1){
          typeSource=1
      }else if(this.tabIndex===2){
        typeSource = 0
      }
      this.queryParams.tabLabel = this.tabLabel;
      this.queryParams.typeSource = typeSource;
      this.queryParams.typeSource = this.typeSource;
      this.getList();
    },
    // 下载报告
@@ -742,7 +740,7 @@
    },
    handleTab(m, i) {
      this.tabIndex = i;
      this.tabLabel = m.label;
      this.typeSource =m.value;
      this.queryParams.sonLaboratory = "";
      this.refreshTable();
    },

 src/views/business/inspectionTask/inspection.vue

@@ -20,7 +20,7 @@
        <el-button v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'" size="small" type="primary" @click="showMaterialPropsDialog">IFS物料属性更新</el-button>
        <el-button size="small" type="primary" @click="refreshView">刷新</el-button>
        <el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">进货验证</el-button>
        <el-button v-if="state == 1 && typeSource == 1" size="small" type="primary"
        <el-button v-if="state == 1 && [0,1].includes(typeSource)" size="small" type="primary"
          @click="openUnPassDialog('add')">不合格处理</el-button>
        <el-button size="small" type="primary" @click="sampleVisible = true; uploadSample();">样品切换</el-button>
        <!--        <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">任务切换</el-button>-->
@@ -986,7 +986,6 @@
          }
        });
      }
      console.log("处理后的模板-",this.tableList)
    },
    // 特殊检验项--监听设备信息改变
    equipForm: {
@@ -1085,9 +1084,6 @@
    },
    disconnect() {
      return disconnect
    },
    sss() {
      console.log(this.$store.state.weightList) //
    },
    // 文件管理--开始
    getList() {
@@ -1389,7 +1385,6 @@
      return newObj;
    },
    handleDataAcquisition(data, noDialog) {
      console.log("dadad--",data)
      // 是否可以编辑数采数据
      if (this.dataAcquisitionEidtAble) {
        this.getDataType = 1;
@@ -1413,9 +1408,7 @@
          };
        }
        // 循环数采数据
        console.log(data[i],i)
        for (let j in data[i]) {
          console.log("jjjjj--",j)
          // 拼接字符串  检验项分类+检验项+检验子项
          let str0 = "";
          if (i.includes("@")) {
@@ -1542,7 +1535,6 @@
                  }
                  let num = 0;
                  list[index].forEach((n) => {
                    // console.log(n.v.ps.value);
                    if (
                      n.v.ps &&
                      n.v.ps.value &&
@@ -1619,7 +1611,6 @@
          this.getDataIndexLoading = false;
          this.dataGetDia = false;
          this.getDataTypeId = "";
          console.log("dadada---",this.dataAcquisitionInfo)
          this.worker0.postMessage(
            JSON.stringify({
              dataAcquisitionInfo: this.dataAcquisitionInfo,
@@ -1633,7 +1624,6 @@
      // 监听 Worker 返回的结果
      this.worker0.onmessage = (event) => {
        let result = JSON.parse(event.data);
        console.log("Worker 返回的结果:", result);
        if (result.method == "changeInput") {
          // 采集后的数据，需要进行计算的线程进行计算
          let { list, n } = result.value;
@@ -2162,7 +2152,6 @@
                  let aa = inspectionItemClass +
                    inspectionItem +
                    inspectionItemSubclass;
                  console.log(aa,str,aa===str)
                  if (
                    this.currentSample.insProduct[i].templateId ===
                    a.templateId &&
@@ -2864,7 +2853,6 @@
        orderId: this.orderId,
        laboratory: this.sonLaboratory,
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
          if (!res.data || res.data.errorMsg.length == 0) {
            this.submitLoading = true;

 src/views/business/productOrder/components/addOrder.vue

@@ -1306,7 +1306,7 @@
        })
      }else{
        // 常规提交
        addInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
        addInsOrder({insOrder: {...this.addObj,typeSource:-1}, sampleList: sampleList}).then(res => {
          this.saveLoad = false
          this.$message.success('已提交')
          this.bsm3Dia = false;

 src/views/business/reportPreparation/index.vue

@@ -259,7 +259,8 @@
      verifyUser: null, // 审核人员
      loadingVerify: false, // 审核人员
      typeSourceList: [
        { label: '成品下单', value: 0 },
        { label: '委托下单', value: -1 },
        { label: '外购下单', value: 0 },
        { label: '原材料下单', value: 1 },
      ],
      orderTypeList: [
@@ -363,9 +364,11 @@
          dataType: "tag",
          formatData: (params) => {
            if (params == 0) {
              return "成品下单";
            } else {
              return "外购下单";
            } else if(params==1) {
              return "原材料下单";
            }else{
              return "委托下单";
            }
          },
        },