Merge branch 'cnas' into master

licp

2024-12-05 25d10ee678644a6283454ca486d74a938eeccfd1

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

@@ -332,7 +332,7 @@
      <div style="width: 100%;height: 100%;" v-if="activeFace >0">
         <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
      </div>
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version" :isLook="isLook" :num1="num1" :orderId0="orderId0" :userInfo="userInfo" />
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version" :isLook="isLook" :num1="num1" :orderId0="orderId0" :userInfo="userInfo" ref="Inspection" />
      <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="80%">
            <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
               <ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
@@ -391,6 +391,13 @@
            </el-input>
          </div>
        </el-col>
        <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="entrustCode" size="small" clearable :disabled="sampleCodeBtnDisabled">
            </el-input>
          </div>
        </el-col>
      </el-row>
      <el-tree :data="storageList" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
               :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
@@ -414,12 +421,19 @@
    <el-dialog title="出库" :visible.sync="exportVisible" width="400px">
      <el-row>
        <el-col class="search_thing" :span="24">
          <div class="search_label" style="width: 90px"><span class="required-span">* </span>样品编号：</div>
          <div class="search_label" style="width: 90px"><span class="required-span">* </span>委托编号：</div>
          <div class="search_input">
            <el-input v-model="sampleCode" size="small" clearable :disabled="sampleCodeBtnDisabled">
              <el-tooltip :content="sampleCodeBtnDisabled?'手动输入':'扫码枪输入'" placement="top" slot="append">
                <el-button type="primary" icon="el-icon-edit" @click="sampleCodeBtnDisabled=!sampleCodeBtnDisabled"></el-button>
              </el-tooltip>
            </el-input>
          </div>
        </el-col>
        <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="entrustCode" size="small" clearable :disabled="sampleCodeBtnDisabled">
            </el-input>
          </div>
        </el-col>
@@ -676,6 +690,7 @@
        scanInsOrderState:false,
        qrCodeVisible: false,
        sampleCode: '',
        entrustCode:'',
        storageList:[],
        expandedKeys: [],
        selectTree: [],
@@ -695,6 +710,7 @@
        if(newVal){
            // this.$message.success('扫码：打开')
            this.sampleCode = null
            this.entrustCode = null
            let input = document.getElementById('ScanCodeInfo');
            input.focus();
            this.startTime = setInterval(()=>{
@@ -710,6 +726,7 @@
        if(newVal){
            // this.$message.success('扫码：打开')
            this.sampleCode = null
            this.entrustCode = null
            let input = document.getElementById('ScanCodeInfo');
            input.focus();
            this.startTime = setInterval(()=>{
@@ -725,7 +742,8 @@
        if(!val){
          this.startTime&&clearInterval(this.startTime)
        }else if(this.exportVisible||this.qrCodeVisible){
          this.sampleCode = null
          // this.sampleCode = null
          // this.entrustCode = null
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
@@ -796,6 +814,10 @@
          this.$message.error('请填写样品编号')
          return
        }
        if (!this.entrustCode) {
          this.$message.error('请填写订单编号')
          return
        }
        if (this.selectTree.length < 4) {
          this.$message.error('请选择样品入库位置')
          return
@@ -804,11 +826,13 @@
        this.$axios.post(this.$api.insOrderPlan.scanInsOrderState, {
          trees: this.selectTree.join('-'),
          sampleCode:this.sampleCode,
          entrustCode:this.entrustCode,
          sonLaboratory: this.componentData.entity.sonLaboratory
        }).then(res => {
          this.upLoadStorage = false;
          this.qrCodeVisible = false
          this.sampleCode = '';
          this.entrustCode = '';
          this.selectTree = []
          if (res.code == 201) {
            this.$message.error('添加失败')
@@ -824,14 +848,20 @@
          this.$message.error('请填写样品编号')
          return
        }
        if (!this.entrustCode) {
          this.$message.error('请填写订单编号')
          return
        }
        this.upLoadExport = true;
        this.$axios.post(this.$api.insOrderPlan.outInsOrderState, {
          sampleCode:this.sampleCode,
          entrustCode:this.entrustCode,
          sonLaboratory: this.componentData.entity.sonLaboratory
        }).then(res => {
          this.upLoadExport = false;
          this.exportVisible = false
          this.sampleCode = '';
          this.entrustCode = '';
          if (res.code == 201) {
            this.$message.error('出库失败')
            return
@@ -842,13 +872,15 @@
      },
      // 扫码枪按下
      keyup(e){
        var code = ''
        var codeInfo = null
        try{
          code = this.codeInfo.substring()
          if(code==null||code==undefined||code==''){
            this.$message.error('该二维码有误')
          console.log(2222,this.codeInfo)
          codeInfo = JSON.parse(this.codeInfo)
          if(!codeInfo||codeInfo.sampleCode==undefined||codeInfo.entrustCode==undefined){
              this.$message.error('该二维码有误')
          }else{
            this.sampleCode = code
              this.sampleCode = codeInfo.sampleCode
              this.entrustCode = codeInfo.entrustCode
          }
        }catch(e){
          this.$message.error('请调至英文键盘')