From 8c16c0fdac9d895f8b53a8032f47cddfe8490ff9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 24 九月 2024 17:34:15 +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 | 133 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 117 insertions(+), 16 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index bb8207d..d2b2b07 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -138,7 +138,7 @@
<div class="center">
<div class="center-options">
<el-row>
- <el-col :span="21">
+ <el-col :span="18">
<div style="display: flex;align-items: center;margin-bottom: 10px;">
<ul class="tab">
<li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label.replace('璇曢獙瀹�','')}}
@@ -150,8 +150,9 @@
</div>
</div>
</el-col>
- <el-col :span="3">
+ <el-col :span="6">
<div class="center-title">
+ <el-button size="small" type="primary" @click="handleCode" style="margin-right: 16px;">鎵爜鎶ユ</el-button>
<span>鎬昏浠诲姟鏁伴噺:</span>
<span>{{total}}</span>
</div>
@@ -244,7 +245,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="lookHistory(scope.row)" type="text" size="small" :disabled="!scope.row.num1 || scope.row.num1<1" v-if="getInsProduct2">鏌ョ湅璁板綍</el-button>
+ <el-button @click="lookHistory0(scope.row)" type="text" size="small" :disabled="!scope.row.num1 || scope.row.num1<1">鏌ョ湅璁板綍</el-button>
</template>
</el-table-column>
</el-table>
@@ -306,12 +307,53 @@
:componentData="componentDataDataLook"/>
</div>
</el-dialog>
+ <el-dialog title="鏌ョ湅璁板綍" :visible.sync="historyDialogVisible" width="50%">
+ <el-table
+ :data="historyList"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="submitTime"
+ label="鎻愪氦鏃ユ湡"
+ width="150">
+ </el-table-column>
+ <el-table-column
+ prop="submitUserName"
+ label="鎻愪氦浜�"
+ width="90">
+ </el-table-column>
+ <el-table-column
+ prop="term"
+ label="瀹為獙闃舵"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="note"
+ label="瀹為獙鎿嶄綔"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="tell"
+ label="鍐嶆妫�楠屽師鍥�"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ 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>
</div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
- import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import {
getYearAndMonthAndDays
} from '../../util/date'
@@ -325,6 +367,9 @@
},
data() {
return {
+ currentHistory:{},
+ historyDialogVisible:false,
+ historyList:[],
orderStateId:null,
version:null,
examine: null,
@@ -542,6 +587,9 @@
inspection:false,
isLook:false,//鏄惁鏄煡鐪嬪巻鍙查〉闈�
num1:null,
+ codeInfo:null,
+ startTime:null,
+ scanInsOrderState:false
}
},
created() {
@@ -559,6 +607,45 @@
}
},
methods: {
+ // 鎵爜鎶ユ
+ handleCode(){
+ let input = document.getElementById('ScanCodeInfo');
+ // console.log(1234567,input,this.startTime)
+ input.focus();
+ this.startTime&&clearInterval(this.startTime)
+ this.startTime = setInterval(()=>{
+ input.focus()
+ },1000)
+ },
+ // 鎵爜鏋寜涓�
+ keyup(e){
+ var code = ''
+ console.log(3333,this.codeInfo)
+ try{
+ code = JSON.parse(this.codeInfo)
+ if(code==null||code==undefined||code==''){
+ this.$message.error('璇ヤ簩缁寸爜鏈夎')
+ }else{
+ this.$axios.post(this.$api.insOrderPlan.scanInsOrderState,
+ {
+ sonLaboratory: this.componentData.entity.sonLaboratory,
+ sampleCode: code
+ }
+ ).then(res => {
+ if(res.code==200){
+ this.$message({
+ type: 'success',
+ message: '鎶ユ鎴愬姛'
+ })
+ }
+ this.refreshTable()
+ })
+ }
+ }catch(e){
+ this.$message.error('璇ヤ簩缁寸爜鏈夎')
+ }
+ this.codeInfo = null
+ },
// 鎷栨嫿
initializeSortable() {
const tableBody = this.$refs.table0.$el.querySelector('.el-table__body-wrapper > table > tbody');
@@ -611,7 +698,8 @@
let review = false
let claim = false
let jumpTeam = false
- let getInsProduct2 = false
+ // let getInsProduct2 = false
+ // let getInsOrderUserList = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'doInsOrder') {
inspection = true
@@ -628,13 +716,16 @@
if (power[i].menuMethod == 'jumpTeam') {
jumpTeam = true
}
- if (power[i].menuMethod == 'getInsProduct2') {
- getInsProduct2 = true
+ // if (power[i].menuMethod == 'getInsProduct2') {
+ // getInsProduct2 = true
+ // }
+ if (power[i].menuMethod == 'scanInsOrderState') {
+ this.scanInsOrderState = true
}
}
- if (!getInsProduct2) {
- this.componentData.do.splice(5, 1)
- }
+ // if (!getInsProduct2) {
+ // this.componentData.do.splice(5, 1)
+ // }
if (!claim) {
this.componentData.do.splice(4, 1)
}
@@ -647,7 +738,7 @@
if (!inspection) {
this.componentData.do.splice(1, 1)
}
- this.getInsProduct2 = getInsProduct2
+ // this.getInsProduct2 = getInsProduct2
this.claim = claim
this.review = review
this.connect = connect
@@ -671,7 +762,7 @@
this.sampleUserForm = {
entrustCode: row.entrustCode,
insSampleId: row.id,
- sonLaboratory: row.sonLaboratory,
+ sonLaboratory: row.sonLaboratory,
}
this.claimVisible = true
}
@@ -890,13 +981,23 @@
this.personList = data
})
},
+ lookHistory0(row){
+ this.currentHistory = row
+ this.$axios.post(this.$api.insOrderPlan.getInsOrderUserList, {
+ insOrderStateId:row.orderStateId,
+ }).then(res => {
+ this.historyList = res.data
+ this.historyDialogVisible = true
+ })
+ },
lookHistory(row){
this.isLook = true
this.state = 2;
- this.orderId = row.id
- this.version = row.version
- this.orderStateId = row.orderStateId
- this.num1 = row.num1
+ this.orderId = this.currentHistory.id
+ this.version = this.currentHistory.version
+ this.orderStateId = this.currentHistory.orderStateId
+ this.num1 = row.num
+ this.historyDialogVisible = false
}
}
}
--
Gitblit v1.9.3