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

licp

2024-04-22 cd60a218f5c1547dbc62cf4be78c31132b0f7628

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

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

@@ -301,10 +301,7 @@
                <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
                    show-overflow-tooltip></el-table-column>
                <el-table-column prop="sonLaboratory" label="子实验室" width="130" show-overflow-tooltip></el-table-column>
                <el-table-column prop="method" label="试验方法" min-width="120" show-overflow-tooltip>
          <template slot-scope="scope">
            <span>{{scope.row.method.replace('[','').replace(']','').replaceAll('"','')}}</span>
          </template>
                <el-table-column prop="methodS" label="试验方法" min-width="120" show-overflow-tooltip>
        </el-table-column>
                <el-table-column prop="unit" label="计量单位" width="100" show-overflow-tooltip></el-table-column>
                <el-table-column prop="price" label="单价" width="100" show-overflow-tooltip></el-table-column>
@@ -684,7 +681,7 @@
                    this.saveLoad = true
                    this.$axios.post(this.$api.insOrder.addInsOrder, {
                        insOrder: this.addObj,
                        list: this.sampleList
                        list: JSON.stringify(this.sampleList)
                    }, {
                        headers: {
                            'Content-Type': 'application/json'

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

@@ -114,11 +114,11 @@
  }
</style>
<style>
  .el-form-item__label {
  .inspection .el-form-item__label {
    color: #000;
  }

  .el-drawer__header::before {
  .inspection .el-drawer__header::before {
    content: "";
    display: inline-block;
    width: 4px;
@@ -129,8 +129,14 @@
    margin-right: 8.5px;
  }

  .el-drawer__header {
  .inspection .el-drawer__header {
    color: #303133;
  }

  .inspection .el-input-group__append{
    padding: 0 10px;
    color: #3A7BFA;
    background-color: #fff;
  }
</style>
<template>
@@ -190,7 +196,9 @@
                  <template v-if="n.v.ps!=undefined && n.v.ps.value==='检验值'">
                    <el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
                      :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')||state>1"
                      @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" />
                      @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)">
                      <el-button slot="append" type="primary" icon="el-icon-edit" size="mini" v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
                    </el-input>
                    <el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
                      :autosize="{ minRows: 1}" v-model="n.v.v" :disabled="state>1" />
                    <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
@@ -200,10 +208,6 @@
                    </el-select>
                    <span :style="`font-family:${n.v.ff} !important;`"
                      v-else-if="getInspectionValueType(n.i) == 4">/</span>
                    <el-button type="primary" icon="el-icon-edit" size="mini" circle
                      v-if="getInspectionItemType(n.i) == 1" style="border: 0;margin-left: 2px;"
                      @click="getSystemValue(n)" :disabled="(n.u != userId && n.u != undefined && n.u != '')||state>1">
                    </el-button>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='结论'">
                    <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">合格</span>
@@ -483,8 +487,12 @@
              for (var i = 0; i < b.v.mc.cs; i++) {
                for (var i2 = 0; i2 < b.v.mc.rs; i2++) {
                  if (a.template[c].c === b.c + i && a.template[c].r === b.r + i2) {
                    a.template[c].v.v = this.HaveJson(b).v.v
                    a.template[c].v.ps = this.HaveJson(b).v.ps
                    let bb = this.HaveJson(b)
                    a.template[c].v.v = bb.v.v
                    a.template[c].v.ps = bb.v.ps
                    a.template[c].v.fc = bb.v.fc
                    a.template[c].v.fs = bb.v.fs
                    a.template[c].v.ht = bb.v.ht
                    a.template[c].mc = count
                    break
                  }
@@ -522,8 +530,7 @@
              if (str != '') {
                for (let i in this.currentSample.insProduct) {
                  if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
                    .insProduct[i].inspectionItem + (this.currentSample.insProduct[i].inspectionItemSubclass ===
                    null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass) === str) {
                    .insProduct[i].inspectionItem + this.currentSample.insProduct[i].inspectionItemSubclass === str) {
                      ids.push({
                        r: b.r,
                        id: this.currentSample.insProduct[i].id,
@@ -554,7 +561,7 @@
                  a.template[b].v.v = id.product.unit
                }
                if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '试验方法') {
                  a.template[b].v.v = id.product.method
                  a.template[b].v.v = id.product.methodS
                }
              }
            }
@@ -633,7 +640,6 @@
              this.excelMethodList.push(b)
            }
          })
          console.log(this.param);
          set = Array.sort(set)
          set.forEach(b => {
            let arr = []
@@ -665,7 +671,10 @@
            }
          } catch (e) {}
          try {
            this.param[a.id].equipValue.v.v = a.insProductResult.equipValue
            let equipValue = JSON.parse(a.insProductResult.equipValue)
            for (var i = 0; i < equipValue.length; i++) {
              this.param[a.id].equipValue[i].v.v = equipValue[i].v
            }
          } catch (e) {}
          try {
            this.param[a.id].resValue.v.v = a.lastValue
@@ -710,10 +719,10 @@
                }
              })
            })
            // console.log('当前的方法',item.methodName,item.r,item.c,this.excelMethodList)
            if (item.methodName == '自定义方法' && item.v.ps && item.v.ps.value == '结论') {
              if (this.tableList.find(m => m.id == item.i)) {
                let ask = this.tableList.find(m => m.id == item.i).ask.split('&');
            console.log(item);
            if (item.methodName == '自定义方法' && item.v.ps!=undefined && item.v.ps.value == '结论') {
              if (this.currentSample.insProduct.find(m => m.id == item.i)) {
                let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&');
                let res = Object.values(comValue)[0]
                let comp = ask.map((m, i) => {
                  if (m.includes('=')) {
@@ -737,17 +746,7 @@
                } else {
                  item.v.v = 0
                }
                this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
                  headers: {
                    'Content-Type': 'application/json'
                  }
                }).then(res => {
                  if (res.code == 201) {
                    this.$message.error('保存失败')
                    return
                  }
                  this.$message.success('已保存')
                })
                this.saveInsContext()
              }
            } else {
              let comResult = 0;
@@ -792,7 +791,7 @@
                if (a[0].r == item.r) {
                  for (var b in a) {
                    if (a[b].c == item.c) {
                      a[b].v.v = parseFloat(comResult.toFixed(2))
                      a[b].v.v = parseFloat(comResult.toFixed(3))
                      break
                    }
                  }
@@ -971,6 +970,19 @@
          console.error(error)
          this.submitLoading = false;
        })
      },
      saveInsContext(){
        this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
          headers: {
            'Content-Type': 'application/json'
          }
        }).then(res => {
          if (res.code == 201) {
            this.$message.error('保存失败')
            return
          }
          this.$message.success('已保存')
        })
      }
    }
  }

 src/components/view/a5-capacity-scope.vue

@@ -66,9 +66,9 @@
                            v-model="itemParameterData.entity.inspectionItem" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
                <div class="search_thing">
                    <div class="search_label">实验室：</div>
                    <div class="search_label">检验子项：</div>
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
                            v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
                <div class="search_thing" style="padding-left: 30px;">
                    <el-button size="small" @click="refresh()">重 置</el-button>
@@ -116,7 +116,7 @@
                itemParameterData: {
                    entity: {
                        inspectionItem: null,
                        laboratory: null,
                        inspectionItemSubclass: null,
                        orderBy: {
                            field: 'id',
                            order: 'asc'