Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

spring

2025-02-20 c2e684e0caab67573bb2df44d6f0c73bbaedd9c7

 src/views/business/productOrder/index.vue

@@ -376,7 +376,7 @@
            } else if (params == 3) {
              return '不判定'
            } else {
              return ''
              return null
            }
          },
          formatType: (params) => {
@@ -387,7 +387,7 @@
            } else if (params == 3) {
              return ''
            }  else {
              return ''
              return null
            }
          }
        },
@@ -499,6 +499,16 @@
              },
              showHide: (row) => {
                return this.tabIndex === 4 || this.tabIndex === 5
              }
            },
            {
              name: '原始记录',
              type: 'text',
              clickFun: (row) => {
                this.viewInspectInfo(row);
              },
              showHide: (row) => {
                return this.tabIndex === 2 || this.tabIndex === 3 || this.tabIndex === 6
              }
            },
          ]
@@ -999,13 +1009,6 @@
        link.click();
      }
    },
    // 审核
    handleVerify(row) {
      // this.verifyDialogVisible = true;
      this.active = 3;
      this.currentId = row.id
      this.examine = 1
    },
    // 撤销
    handlEquash(row) {
      if(this.tabIndex!=1){
@@ -1066,8 +1069,6 @@
    handlEquashCheck(row){
      this.orderId = row.id
      this.revocationInsProductIds = row.revocationInsProductIds
      this.componentDataDelete.showSelect= false
      this.componentDataDelete.select= false
      this.deleteTilte = '撤销审核'
      this.deleteDialogVisible = true;
    },
@@ -1166,7 +1167,7 @@
          }
        })
      }
      let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
      let authorizedPerson = this.formData.authorizedPerson && this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
      delete this.formData.createTime
      delete this.formData.updateTime
      delete this.formData.createUser
@@ -1175,7 +1176,11 @@
    },
    // 下单
    playOrder(num) {
      this.$router.push({ path: "/productOrder/add", query: {examine: 0,active: num} });
      this.$router.push({ path: "/productOrder/add", query: {examine: 0,active: num, tabIndex: this.tabIndex} });
    },
    // 审核
    handleVerify(row) {
      this.$router.push({ path: "/productOrder/add", query: {examine: 1,active: 3, currentId: row.id} });
    },
    handleTab(m, i) {
      this.tabIndex = i;