Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-06-12 c26e25fc5307d23fddcda5f6692ec62acbecc8f3

Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

 src/components/do/b1-ins-order/add.vue

@@ -1134,6 +1134,7 @@
      addStandardTree() {
        if (this.selectTree == null) return
        this.sampleList = []
        this.productList = []
        for (var i = 0; i < this.addObj.sampleNum; i++) {
          this.sample.joinName = null
          this.sample.joinModel = null
@@ -1216,8 +1217,13 @@
            this.computationalPairing(this.sampleList.length)
            this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
          }
        } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && row.state === 1) {
        } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && row.state === 1 && this.sampleList.length > 1) {
          this.bsm2 = false
        } else if(row.bsm === '1' && row.inspectionItem === '熔接损耗' && this.sampleList.length < 2){
          this.$message.error('样品数量不足够进行配对操作')
          row.state = row.state == 1 ? 0 : 1
          this.$refs.productTable.toggleRowSelection(row, false)
          return
        }
        if (row.ask.includes('RTS')&&row.state === 1) {
          this.bsmRow3 = null;
@@ -1471,8 +1477,12 @@
              this.computationalPairing(this.sampleList.length)
              this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
            }
          } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1) {
          } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1 && this.sampleList.length > 1) {
            this.bsm2 = false
          } else if(p.bsm === '1' && p.inspectionItem === '熔接损耗' && this.sampleList.length < 2){
            this.$message.error('样品数量不足够进行配对操作')
            this.$refs.productTable.clearSelection()
            return
          }
          if (p.ask.includes('RTS')&&p.state === 1) {
            p.rts = ''

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -155,9 +155,12 @@
  }

  .inspection .el-input-group__append {
    padding: 0 10px;
    padding: 0 14px;
    color: #3A7BFA;
    background-color: #fff;
    height: 100%;
    display: flex;
    align-items: center;
  }

  .inspection .center-box .el-input__inner {
@@ -1441,20 +1444,34 @@
        }
      },
      getSystemValue(n) {
        let code = null
        try {
          if (this.param[n.i].equipValue.v.v == null || this.param[n.i].equipValue.v.v == '') {
            this.$message.error('请先选择采集的设备')
            return
          }
          this.param[n.i].equipValue.forEach(a=>{
            if(a.r === n.r){
              if (a.v.v == null || a.v.v == '') {
                this.$message.error('请先选择采集的设备')
                return
              }else{
                code = a.v.v
              }
            }
          })
        } catch (e) {
          console.log(e);
          this.$message.error('找不到设备内容')
        }
        this.$message.error('采集失败【已开放手动方式】')
        console.log(n, code);
        fetch('http://localhost:82/微信图片_20240518100811.png').then(res=>res.blob()).then(blob=>{
          console.log(blob);
          const url = URL.createObjectURL(blob)
          console.log(url);
        })
        /* this.$message.error('采集失败【已开放手动方式】')
        for (var a in this.currentSample.insProduct) {
          if (this.currentSample.insProduct[a].id == n.i) {
            this.currentSample.insProduct[a].inspectionItemType = 0
          }
        }
        } */
      },
      getEquipOptions(e, id) {
        if (e) {
@@ -1575,7 +1592,7 @@
                if(lastChar=='-'){
                  res.data[i] = res.data[i].slice(0, -1);
                }
                newData.push(h('p', {style: 'font-size: 12px;'}, (Number(i)+1)+'、'+res.data[i]))
                newData.push(h('p', {style: 'font-size: 14px;color: red;'}, (Number(i)+1)+'、'+res.data[i]))
              }
              newData.push(h('p',  { style: 'font-size: 16px;color:#000;margin-top:12px' },'以上项目不合格，确定提交？'))
              this.$confirm('提示',{

 src/components/view/b1-unpass.vue

@@ -96,6 +96,13 @@
          select: false,
          do: [
          ],
          spanConfig: {
            rows: [{
                name: 'entrustCode',
                index: 1
              }
            ]
          },
          tagField: [],
          selectField: [],
          requiredAdd: ['model','sample',],