From 25d10ee678644a6283454ca486d74a938eeccfd1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 05 十二月 2024 16:50:45 +0800
Subject: [PATCH] Merge branch 'cnas' into master
---
src/components/view/b1-inspect-order-plan.vue | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 0a3f2cf..2e0232d 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/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('璇疯皟鑷宠嫳鏂囬敭鐩�')
--
Gitblit v1.9.3