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

licp

2024-07-01 f537cbb4a04fcbb022323126ff4670540a78b842

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

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

@@ -420,16 +420,38 @@
              <span>检验项</span>
              <el-input
              v-model="inspectionItem"
              @input="searchFilterList"
              size="mini"
              placeholder="请输入"/>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
          show-overflow-tooltip></el-table-column>
          show-overflow-tooltip>
          <template slot="header" slot-scope="scope">
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
              <span>检验项子项</span>
              <el-input
                v-model="inspectionItemSubclass"
                @input="searchFilterList"
                size="mini"
                placeholder="请输入"/>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="sonLaboratory" label="子实验室" min-width="130" show-overflow-tooltip :filters="filters"
          :filter-method="filterHandler"></el-table-column>
        <el-table-column prop="methodS" label="试验方法" min-width="120" show-overflow-tooltip>
          <template slot="header" slot-scope="scope">
            <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
              <span>试验方法</span>
              <el-input
                v-model="methodS"
                @input="searchFilterList"
                size="mini"
                placeholder="请输入"/>
            </div>
          </template>
        </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>
@@ -738,12 +760,13 @@
</template>

<script>
  import ValueTable from '../../tool/value-table.vue'
  import fiberOpticConfig from './fiberoptic-config.vue'
  import equipConfig from './equip-config.vue'
  import cableConfig from './cable-config.vue'
  import Vue from 'vue'
  export default {
import ValueTable from '../../tool/value-table.vue'
import fiberOpticConfig from './fiberoptic-config.vue'
import equipConfig from './equip-config.vue'
import cableConfig from './cable-config.vue'
import Vue from 'vue'

export default {
    components: {
      ValueTable,
      fiberOpticConfig,
@@ -848,6 +871,7 @@
        addSampleDia: false,
        count: 1,
        productList: [],
        productList0: [],
        bsm1DiaList: [],
        productIds: [],
        getProductLoad: false,
@@ -899,6 +923,8 @@
        symbolList:[
        'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
        inspectionItem:null,
        inspectionItemSubclass:null,
        methodS:null,
        circulateShow:false,
        circulateForm:{},
        isBsm2Val2:false
@@ -976,6 +1002,28 @@
      }
    },
    methods: {
      searchFilterList () {
        const vtw = {
          inspectionItem: this.inspectionItem, // 检验项
          inspectionItemSubclass: this.inspectionItemSubclass, // 检验项子项
          methodS: this.methodS, // 试验方法
        }
        const isHaveValue = Object.values(vtw).some(item => {
          return item
        })
        if (isHaveValue) {
          for(let i in vtw) {
            if (vtw[i]) {
              this.productList = this.productList0.filter((item) => {
                return item[i] && item[i].includes(vtw[i])
              })
            }
          }
        } else {
          // 没有查询条件时渲染所有数据
          this.productList = this.productList0
        }
      },
      getAuthorizedPerson() {
        this.$axios.get(this.$api.user.getUserMenu).then(res => {
          let data = []
@@ -1798,6 +1846,7 @@
          row.insProduct = this.HaveJson(res.data)
          this.getProductLoad = false
          this.productList = row.insProduct
          this.productList0 = JSON.parse(JSON.stringify(this.productList))
          this.$refs.sampleTable.setCurrentRow(row)
          setTimeout(() => {
            this.productList.forEach(a => {