From 7319ab1ce998a7d13f0192a4ccaf92d4a02929f8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 11 十二月 2024 14:33:43 +0800
Subject: [PATCH] 电路试验上传文件报错

---
 src/components/view/b1-inspect-order-plan.vue |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index c96f0ae..d4c6c44 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -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"
@@ -420,6 +427,13 @@
               <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('璇疯皟鑷宠嫳鏂囬敭鐩�')

--
Gitblit v1.9.3