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

licp

2024-10-28 3845f43c43252185a134566a63670de9d1c2d253

 src/components/view/b1-inspect-order-plan.vue

@@ -166,8 +166,8 @@
                  </el-col>
                  <el-col :span="6">
                     <div class="center-title">
                <el-button size="small" type="primary" @click="qrCodeVisible=true">扫码报检</el-button>
                <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;">出库</el-button>
                <el-button size="small" type="primary" @click="qrCodeVisible=true" v-if="selectWarehouse">扫码报检</el-button>
                <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;" v-if="selectWarehouse">出库</el-button>
                        <span>总计任务数量:</span>
                        <span>{{total}}</span>
                     </div>
@@ -265,7 +265,7 @@
            <el-button @click="handleConnect(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 5  || scope.row.insState == 3||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))" v-if="connect">交接</el-button>
            <el-button @click="handleReview(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState != 3 ||(scope.row.checkName&&!scope.row.checkName.includes(userName))" v-if="review">复核</el-button>
            <el-button @click="claimFun(scope.row)" type="text" size="small" :disabled="scope.row.userName != null || scope.row.checkName!=null" v-if="claim">认领</el-button>
            <el-button @click="lookHistory0(scope.row)" type="text" size="small" :disabled="!scope.row.num1 || scope.row.num1<1">查看记录</el-button>
            <el-button @click="lookHistory0(scope.row)" type="text" size="small">查看记录</el-button>
          </template>
          </el-table-column>
        </el-table>
@@ -335,39 +335,38 @@
          <el-table-column
            prop="submitTime"
            label="提交日期"
            width="150">
            min-width="150">
          </el-table-column>
          <el-table-column
            prop="submitUserName"
            label="提交人"
            width="90">
            min-width="90">
          </el-table-column>
          <el-table-column
            prop="term"
            label="实验阶段"
            width="120">
            min-width="120">
          </el-table-column>
          <el-table-column
            prop="note"
            label="实验操作"
            width="120">
            min-width="120">
          </el-table-column>
          <el-table-column
            prop="tell"
            label="再次检验原因"
            width="120">
            min-width="120">
          </el-table-column>
          <el-table-column
            fixed="right"
            label="操作"
            width="100">
            min-width="100">
            <template slot-scope="scope">
              <el-button @click="lookHistory(scope.row)" type="text" size="small">查看</el-button>
            </template>
          </el-table-column>
        </el-table>
         </el-dialog>
      <input type="text" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"  autocomplete="off"></input>
    <el-dialog title="扫码检验" :visible.sync="qrCodeVisible" width="350px">
      <el-row>
        <el-col class="search_thing" :span="24">
@@ -401,7 +400,7 @@
        <el-col class="search_thing" :span="24">
          <div class="search_label" style="width: 90px"><span class="required-span">* </span>样品编号：</div>
          <div class="search_input">
            <el-input v-model="sampleCode" size="small"></el-input>
            <el-input v-model="sampleCode" size="small" clearable></el-input>
          </div>
        </el-col>
      </el-row>
@@ -660,6 +659,7 @@
        upLoadStorage: false,
        exportVisible: false,
        upLoadExport: false,
        selectWarehouse:false
         }
      },
      created() {
@@ -667,7 +667,6 @@
         this.getTypeDicts()
         this.getInsStateDicts()
      this.getAuthorizedPerson()
      this.selectList()
      this.currentTime = getYearAndMonthAndDays()
      },
      mounted() {
@@ -677,36 +676,6 @@
        this.initializeSortable();
      }
      },
    watch:{
      qrCodeVisible(newVal){
        if(newVal){
          // this.$message.success('扫码：打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
          },1000)
        }else{
          // this.$message.warning('扫码：关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
      exportVisible(newVal){
        if(newVal){
          // this.$message.success('扫码：打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
          },1000)
        }else{
          // this.$message.warning('扫码：关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
    },
      methods: {
      selectList () {
        this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
@@ -892,6 +861,10 @@
          if (power[i].menuMethod == 'scanInsOrderState') {
                  this.scanInsOrderState = true
               }
          if (power[i].menuMethod == 'scanInsOrderState') {
                  this.selectWarehouse = true
            this.selectList()
               }
            }
        // if (!getInsProduct2) {
            //    this.componentData.do.splice(5, 1)