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

licp

2024-07-11 39b0abc198534c9b69ac6d5969b12e7d76dd5e1d

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

@@ -458,6 +458,8 @@
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="inspectionItemClass" v-if="PROJECT === '装备电缆'" label="检验项分类" min-width="140" show-overflow-tooltip></el-table-column>
        <el-table-column prop="inspectionItemClassEn" v-if="PROJECT === '装备电缆'" label="检验项分类(EN)" min-width="140" show-overflow-tooltip></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>
@@ -802,7 +804,7 @@
        </div>
        <div class="temperatureList">
          <div class="temperatureListTitle">
            <span>温度点集合(请按照顺序填写，20℃必须为首位)</span>
            <span>温度点集合</span>
            <span>
              <el-button type="primary" size="mini" @click="addTemperatureData">新增</el-button>
              <el-button size="mini" @click="deleteTemperatureData">删除</el-button>
@@ -834,6 +836,7 @@
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="cleanSpliceData">取消</el-button>
        <el-button type="primary" @click="spliceData">保存</el-button>
      </span>
    </el-dialog>
@@ -1170,17 +1173,33 @@
        console.log('tell---', tell)
        this.circulateShow = false
      },
      cleanSpliceData () {
        this.circulateForm.entrustNum = null
        this.circulateForm.entrustTime = null
        this.circulateForm.entrustPoint = null
        this.opticalProjectList = []
        this.$refs.multipleTable.clearSelection()
        this.temperatureData = []
        this.circulateShow = false
      },
      beforeCirculateShowClose () {
        if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
          this.$message.error('请填写完整数据')
          return
        }
        let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))
        temperaturePoint1.forEach(t => {
          if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
            throw this.$message.error('请填写完整数据')
          if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
            this.$message.error('请填写完整数据')
            return
          }
        })
          // 拼接要求值ask
          const opticalProjectList = JSON.parse(JSON.stringify(this.opticalProjectList))
          opticalProjectList.forEach(o => {
            o.temperatureData.forEach(t => {
              if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
                throw this.$message.error('请填写完整数据')
              }
            })
            if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
              throw this.$message.error(`${o.value + '波长没有配置20℃温度点'}`)
            }
          })
          this.spliceData()
      },
      handleSelectionChange(val) {
        this.opticalProjectList = val;
@@ -1380,6 +1399,11 @@
          console.log('isHaveBushing===', isHaveBushing)
          if (productListSelected && select[2] === '光缆' && isHaveBushing === false) {
            this.$message.error('光缆温度循环项目必须进行光纤配置')

            this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
            this.rowClick(this.currentMethod)
            this.sampleIds = [this.currentMethod.id]
            this.openConfig()
            return
          }
          let sampleList = this.HaveJson(this.sampleList)
@@ -2197,7 +2221,9 @@
      handleAll(e) {
        if (e.length > 0) {
          this.productList.map(m => {
            m.state = 1
            if(e.find(a=>a.id == m.id)){
              m.state = 1
            }
            return m
          })
        } else {