Merge remote-tracking branch 'origin/master'

value

2024-05-31 620880da2e11fe0a56d24662f4736332bf08e9e5

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

@@ -373,8 +373,9 @@
        <el-table-column prop="section" label="区间" width="120" show-overflow-tooltip></el-table-column>
        <el-table-column prop="ask" label="要求值" min-width="220px">
          <template slot-scope="scope">
            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea" readonly
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)" v-if="active==1&&isAskOnlyRead"></el-input>
              <span v-else>{{ scope.row.ask }}</span>
          </template>
        </el-table-column>
      </el-table>
@@ -672,6 +673,8 @@
        filters: [],
        formType: [],
        configShow: false,
        currentMethod: null,
        isAskOnlyRead:false,
        sampleId: null
      }
    },
@@ -1054,6 +1057,13 @@
        })
      },
      rowClick(row, column, event) {
        this.currentMethod = row
        let obj = this.methods.find(a=>a.id==this.currentMethod.standardMethodListId)
        if(obj&&obj.code=='委托要求'){
          this.isAskOnlyRead = true
        }else{
          this.isAskOnlyRead = false
        }
        this.sampleId = row.id
        if(this.active!==1){
          this.sampleIds = []
@@ -1186,6 +1196,13 @@
      },
      methodChange(val, row) {
        if(val===null||val==='')return
        this.currentMethod = row
        let obj = this.methods.find(a=>a.id==this.currentMethod.standardMethodListId)
        if(obj&&obj.code=='委托要求'){
          this.isAskOnlyRead = true
        }else{
          this.isAskOnlyRead = false
        }
        this.getProductLoad = true
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: row.model + '-' + row.modelNum,