From 3845f43c43252185a134566a63670de9d1c2d253 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 28 十月 2024 15:06:45 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/view/b1-inspect-order-plan.vue | 65 ++++++++++----------------------
1 files changed, 20 insertions(+), 45 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index b10b282..d544a33 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/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,45 +335,44 @@
<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">
<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>
@@ -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 => {
@@ -803,14 +772,16 @@
keyup(e){
var code = ''
try{
- code = JSON.parse(this.codeInfo)
+ // console.log(2222,this.codeInfo)
+ code = this.codeInfo.substring()
if(code==null||code==undefined||code==''){
this.$message.error('璇ヤ簩缁寸爜鏈夎')
}else{
this.sampleCode = code
}
}catch(e){
- this.$message.error('璇ヤ簩缁寸爜鏈夎')
+ this.$message.error('璇疯皟鑷宠嫳鏂囬敭鐩�')
+ console.log(e)
}
this.codeInfo = null
},
@@ -890,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)
--
Gitblit v1.9.3