Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into m...

licp

2024-09-24 8c16c0fdac9d895f8b53a8032f47cddfe8490ff9

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

@@ -185,18 +185,13 @@
            <div class="search_label"><span class="required-span">* </span>制单人：</div>
            <div class="search_input">
              <el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
              <!-- <el-input readonly size="small" v-model="addObj.custom">
                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
                    :disabled="active>1"></el-button></template>
              </el-input> -->
            </div>
          </el-col>
          <el-col class="search_thing" :span="6">
            <div class="search_label"><span class="required-span">* </span>委托单位：</div>
            <div class="search_input">
              <!-- <el-input size="small" placeholder="←选择委托客户" clearable disabled v-model="addObj.company"></el-input> -->
              <el-input readonly size="small" v-model="addObj.company" placeholder="选择委托单位">
                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=1"
                    :disabled="active>1"></el-button></template>
              </el-input>
            </div>
@@ -261,7 +256,22 @@
              </el-select>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6">
          <el-col class="search_thing" :span="6" v-if="addObj.formType==='其他成品'">
            <div class="search_label">零件号：</div>
            <div class="search_input">
              <el-input size="small" :placeholder="active>1 ? '' : '请输入'" clearable v-model="addObj.partNo"
                        :readonly="active>1"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6" v-if="addObj.formType!='其他成品'&&addObj.formType">
            <div class="search_label"><span class="required-span">* </span>下发至对象：</div>
            <div class="search_input">
              <el-select v-model="addObj.issueUser" size="small" :disabled="active>1" style="width: 100%;">
                <el-option v-for="(a,ai) in personList" :key="ai" :label="a.label" :value="a.value"></el-option>
              </el-select>
            </div>
          </el-col>
          <!-- <el-col class="search_thing" :span="6">
            <div class="search_label">报告发送方式：</div>
            <div class="search_input">
              <el-radio-group v-model="addObj.send">
@@ -269,8 +279,8 @@
                <el-radio :label="0">其他</el-radio>
              </el-radio-group>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6">
          </el-col> -->
          <!-- <el-col class="search_thing" :span="6">
            <div class="search_label">样品处理方式：</div>
            <div class="search_input">
              <el-radio-group v-model="addObj.processing">
@@ -278,7 +288,7 @@
                <el-radio :label="1">实验室处理</el-radio>
              </el-radio-group>
            </div>
          </el-col>
          </el-col> -->
          <el-col class="search_thing" :span="6">
            <div class="search_label">工程名称：</div>
            <div class="search_input">
@@ -296,8 +306,12 @@
          <el-col class="search_thing" :span="6">
            <div class="search_label"><span class="required-span">* </span>生产单位：</div>
            <div class="search_input">
              <el-input size="small" placeholder="请输入" clearable v-model="addObj.production"
                :readonly="active>1"></el-input>
              <!-- <el-input size="small" placeholder="请输入" clearable v-model="addObj.production"
                :readonly="active>1"></el-input> -->
              <el-input size="small" v-model="addObj.production" placeholder="选择生产单位" :readonly="active>1">
                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=2"
                    :disabled="active>1"></el-button></template>
              </el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6">
@@ -307,7 +321,7 @@
                :readonly="active>1"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6">
          <!-- <el-col class="search_thing" :span="6">
            <div class="search_label">是否留样：</div>
            <div class="search_input">
              <el-radio-group v-model="addObj.isLeave">
@@ -315,7 +329,7 @@
                <el-radio :label="1">留样</el-radio>
              </el-radio-group>
            </div>
          </el-col>
          </el-col> -->
          <el-col class="search_thing" :span="6">
            <div class="search_label" style="width: 175px;">是否涉及配套样品：</div>
            <div class="search_input" style="width: calc(100% - 175px);">
@@ -325,12 +339,12 @@
              </el-radio-group>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6">
          <!-- <el-col class="search_thing" :span="6">
            <div class="search_label">OTC订单号：</div>
            <div class="search_input">
              <el-input size="small" :placeholder="active>1 ? '' : '请输入'" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
            </div>
          </el-col>
          </el-col> -->
          <el-col class="search_thing" :span="6">
            <div class="search_label">委托人：</div>
            <div class="search_input">
@@ -999,7 +1013,8 @@
          companyId: null,
          prepareUser:null,
          departmentLimsId:null,
          departmentLims:null
          departmentLims:null,
          partNo: null, // 零件号
        },
        sample: {
          sampleCode: null,
@@ -1137,7 +1152,8 @@
        sonLaboratoryList:[],
        selectiveEcho: [], // 检验下单的时候勾选检验项目,如果使用筛选提交显示检验项目为空 回显列表
        deaprtEnum:[],
        standard:[]
        standard:[],
        createState:1,//1:选择委托单位，2：选择生产单位
      }
    },
    watch: {
@@ -1236,6 +1252,7 @@
      }
    },
    methods: {

      //特殊值填写处理
      inputValueHandler(row,index){
        if(row){
@@ -1541,14 +1558,23 @@
          this.$message.error('未选择数据')
          return
        }
        this.addObj.company = selects.company
        this.addObj.code = selects.code
        this.addObj.companyId = selects.id
        this.selectUserDia = false
        if(this.active==1){
          // TODO
          this.selectInsOrderTemplate()
        if(this.createState==1){
          this.addObj.company = selects.company
          this.addObj.code = selects.code
          this.addObj.companyId = selects.id
          if(this.active==1){
            this.selectInsOrderTemplate()
          }
        }else if(this.createState==2){
          this.addObj.production = selects.company
          // 如果选择的单位是没有对应的英文名称就用'/'代替
          if (!selects.companyEn) {
            this.addObj.productionEn = '/'
          } else {
            this.addObj.productionEn = selects.companyEn
          }
        }
        this.selectUserDia = false
      },
      containsValue(str) {
        if(str){
@@ -1646,7 +1672,9 @@
          this.$message.error('请输入样品型号')
        } else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
          this.$message.error('请选择检验标准')
        } else {
        } else if(this.addObj.formType&&this.addObj.formType!='其他成品'&&!this.addObj.issueUser){
          this.$message.error('请选择下发对象')
        }else{
          //校验检验项的要求值和要求描述,仅委托要求
          // if(this.active==1&&this.isAskOnlyRead){
          //   const isTrue = this.checkRequiredValueAndRemark(filterProductList)
@@ -2602,12 +2630,11 @@
        })
      },
      methodChange(val, row) {
        if (val === null || val === '') return
        if (val === null || val === ''||val.length ==0) return
        this.currentMethod = row
        this.getProductLoad = true
        let selectTreeList = this.selectTree.split(" - ")
        this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)

        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: (this.addObj.model?this.addObj.model:row.model) + '-' + row.modelNum,
          standardMethodListId: val.join(','),
@@ -2617,11 +2644,11 @@
            'Content-Type': 'application/json'
          }
        }).then(res => {
          this.getProductLoad = false
          res.data.forEach(a => {
            a.state = 0
          })
          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)
@@ -2630,6 +2657,8 @@
              if (a.state == 1) this.toggleSelection(a)
            })
          }, 200)
        }).catch(e => {
          this.getProductLoad = false
        })
        this.searchProject()
        this.searchTemList()
@@ -3220,7 +3249,7 @@
      },
      selectDepartmentEnum(){
        this.$axios.get(this.$api.department.selectDepartmentLimsEnum).then(res=>{
          this.deaprtEnum = res.data
          this.deaprtEnum = res.data.filter(item=>item.name === '质量部' || item.name === '检测中心')
        })
      }
    }