From c263fb316fc23d9db98ce711fda30d81c28d2d9c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 08 八月 2024 19:02:10 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/view/b1-inspect-order-plan.vue | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 89ed36f..ea39299 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -155,6 +155,7 @@
</el-row>
</div>
<ValueTable :tableRowClassName="changeRowClass" class="value-table" ref="insOrderPlan"
+ :isColumnWidth="true"
:url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData" @handleInspection="handleInspection"
:key="upIndex"/>
</div>
@@ -202,7 +203,13 @@
<Add :active="activeFace" :currentId="currentId"/>
</div>
<Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
- </div>
+ <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
+ <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
+ <ValueTable ref="ValueTableDataLook" :url="$api.insOrder.selectSampleAndProductByOrderId"
+ :componentData="componentDataDataLook"/>
+ </div>
+ </el-dialog>
+ </div>
</template>
<script>
@@ -212,6 +219,7 @@
getYearAndMonthAndDays
} from '../../util/date'
import Add from '../do/b1-ins-order/add.vue'
+import { CellGroup } from 'iview'
export default {
components: {
ValueTable,
@@ -230,6 +238,55 @@
tabList: [],
active: 1,
tabIndex: 0,
+ componentDataDataLook: {
+ entity: {
+ id: 0,
+ orderBy: {
+ field: 'sampleCode',
+ order: 'asc'
+ }
+ },
+ isIndex: false,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {
+ insState: {
+ select: []
+ },
+ insResult: {
+ select: [{
+ value: 1,
+ label: '鍚堟牸',
+ type: 'success'
+ },{
+ value: 0,
+ label: '涓嶅悎鏍�',
+ type: 'danger'
+ }]
+ }
+ },
+ selectField: {},
+ spanConfig:{
+ rows:[
+ {
+ name:'sampleCode',
+ index:0
+ },
+ {
+ name:'sample',
+ index:1
+ },
+ {
+ name:'model',
+ index:5
+ }
+ ]
+ },
+ requiredAdd: [],
+ requiredUp: []
+ },
+ dataDialogVisible: false,
componentData: {
entity: {
sonLaboratory: null,
@@ -239,15 +296,28 @@
isIndex: true,
showSelect: false,
select: false,
- sort: false,
init: false,
+ needSort: ['createTime', 'sendTime', 'type', 'appointed', 'insState'],
do: [{
+ id: '',
+ font: '鏁版嵁鏌ョ湅',
+ type: 'text',
+ method: 'handleDataLook',
+ //disabFun: (row, index) => {
+ //const user = JSON.parse(localStorage.getItem('user'))
+ // let currentUserName = ''
+ // if(user){
+ // currentUserName = user.name
+ //}
+ //return row.userName.indexOf(currentUserName)<0 && row.checkName.indexOf(currentUserName)<0
+ //}
+ },{
id: '',
font: '妫�楠�',
type: 'text',
method: 'handleInspection',
disabFun: (row, index) => {
- return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
+ return row.userName == null || row.insState == 3 || row.insState == 5||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
}
// disabFun: (row, index) => {
// return row.userId == null || row.insState == 3 || row.insState == 5
@@ -258,7 +328,7 @@
type: 'text',
method: 'handleConnect',
disabFun: (row, index) => {
- return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3||JSON.parse(localStorage.getItem("user")).name != row.userName
+ return row.userName == null || row.insState == 5 || row.insState == 3||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
}
},
{
@@ -266,8 +336,8 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- disabFun: (row, index) => {
- return row.userId == null || row.insState != 3 ||JSON.parse(localStorage.getItem("user")).name != row.userName
+ disabFun: (row, userName) => {
+ return row.userName == null || row.insState != 3 ||(row.checkName&&!row.checkName.includes(JSON.parse(localStorage.getItem("user")).name))
}
}, {
id: '',
@@ -275,7 +345,7 @@
type: 'text',
method: 'claimFun',
disabFun: (row, index) => {
- return row.userId != null
+ return row.userName != null || row.checkName!=null
}
}
],
@@ -342,6 +412,11 @@
this.getPower()
},
methods: {
+ // 鏁版嵁鏌ョ湅
+ handleDataLook(row) {
+ this.componentDataDataLook.entity.id = row.id
+ this.dataDialogVisible = true;
+ },
// 鏉冮檺鍒嗛厤
getPower(radio) {
let power = JSON.parse(sessionStorage.getItem('power'))
--
Gitblit v1.9.3