From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspect-order-plan.vue | 92 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 23 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 306f42e..d46fe59 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -102,11 +102,16 @@
.ins-order-plan-main .el-form-item__label{
color: #000;
}
+
+ .ins-order-plan-main .el-table th.el-table__cell>.cell{
+ height: 46px;
+ line-height: 30px;
+ }
</style>
<template>
<div class="ins-order-plan-main">
<div v-show="activeFace == 0&&state==0" style="height: 100%;">
- <p style="font-size: 16px;padding:19.5px 0px">妫�楠屼换鍔�</p>
+ <p style="font-size: 16px;padding-left: 20px;text-align: left;height: 60px;line-height: 60px;">妫�楠屼换鍔�</p>
<div class="search">
<div class="search_thing">
<div class="search_label">濮旀墭缂栧彿锛�</div>
@@ -132,7 +137,7 @@
<el-col :span="21">
<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}}
+ <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label.replace('璇曢獙瀹�','')}}
</li>
</ul>
<div>
@@ -163,11 +168,24 @@
</el-dialog>
<el-dialog title="妫�楠屼氦鎺�" :visible.sync="connectVisible" width="400px">
<div class="search_thing">
- <div class="search_label" style="width:90px">浜ゆ帴浜哄憳锛�</div>
+ <div class="search_label" style="width:90px"><span class="required-span">* </span>浜ゆ帴浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="connectPerson" placeholder="璇烽�夋嫨" style="width: 100%;">
+ <el-select v-model="connect.connectPerson" placeholder="璇烽�夋嫨" style="width: 100%;" filterable>
<el-option
v-for="item in personList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label" style="width:90px"><span class="required-span">* </span>璇曢獙瀹わ細</div>
+ <div class="search_input">
+ <el-select v-model="connect.sonLaboratory" placeholder="璇烽�夋嫨" style="width: 100%;" filterable>
+ <el-option
+ v-for="item in sonLaboratoryList"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -189,7 +207,7 @@
<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'
@@ -221,23 +239,26 @@
isIndex: true,
showSelect: false,
select: false,
- sort: false,
init: false,
+ needSort: ['createTime', 'sendTime', 'type', 'appointed', 'insState'],
do: [{
id: '',
font: '妫�楠�',
type: 'text',
method: 'handleInspection',
disabFun: (row, index) => {
- return row.userId == null || row.insState == 3 || row.insState == 5
+ return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
}
+ // disabFun: (row, index) => {
+ // return row.userId == null || row.insState == 3 || row.insState == 5
+ // }
}, {
id: '',
font: '浜ゆ帴',
type: 'text',
method: 'handleConnect',
disabFun: (row, index) => {
- return row.userId == null || row.orderUserId == null
+ return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3||JSON.parse(localStorage.getItem("user")).name != row.userName
}
},
{
@@ -246,7 +267,7 @@
type: 'text',
method: 'handleReview',
disabFun: (row, index) => {
- return row.userId == null || row.insState != 3
+ return row.userId == null || row.insState != 3 ||JSON.parse(localStorage.getItem("user")).name != row.userName
}
}, {
id: '',
@@ -300,9 +321,13 @@
orderId: 0,
personList:[],
connectVisible:false,
- connectPerson:'',
+ connect:{
+ connectPerson:'',
+ sonLaboratory:''
+ },
loading:false,
- currentTime: null
+ currentTime: null,
+ sonLaboratoryList:[]
}
},
created() {
@@ -367,7 +392,8 @@
if (row) {
this.sampleUserForm = {
entrustCode: row.entrustCode,
- insSampleId: row.id
+ insSampleId: row.id,
+ sonLaboratory: row.sonLaboratory,
}
this.claimVisible = true
}
@@ -383,15 +409,15 @@
this.loading = false;
this.$message.success("璁ら鎴愬姛")
this.claimVisible = false
- this.refreshTable()
+ this.refreshTable('page')
}
}).catch(error => {
console.error(error)
this.loading = false;
})
},
- refreshTable() {
- this.$refs.insOrderPlan.selectList()
+ refreshTable(e) {
+ this.$refs.insOrderPlan.selectList(e)
},
changeRowClass({
row,
@@ -486,7 +512,7 @@
},
goback() {
this.state = 0
- this.refreshTable()
+ this.refreshTable('page')
},
handleInspection(row){
this.state = 1;
@@ -494,28 +520,48 @@
},
handleConnect(row){
this.orderId = row.id
+ this.connect = {}
this.connectVisible=true;
+ this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
+ orderId:this.orderId,
+ }).then(res => {
+ if (res.code === 200&&res.data.length>0) {
+ this.sonLaboratoryList = [];
+ res.data.forEach(m=>{
+ this.sonLaboratoryList.push({
+ value:m,
+ label:m
+ })
+ })
+ this.connect.sonLaboratory = this.sonLaboratoryList[0].value
+ }
+ })
},
confirmConnect(){
- if(this.connectPerson){
- this.loading = true;
+ if(this.connect.connectPerson==null||this.connect.connectPerson==''||this.connect.connectPerson==undefined){
+ this.$message.error('鏈�夋嫨浜ゆ帴浜哄憳')
+ return
+ }
+ if(this.connect.sonLaboratory==null||this.connect.sonLaboratory==''||this.connect.sonLaboratory==undefined){
+ this.$message.error('鏈�夋嫨璇曢獙瀹�')
+ return
+ }
+ this.loading = true;
this.$axios.post(this.$api.insOrderPlan.upPlanUser, {
orderId:this.orderId,
- userId:this.connectPerson
+ userId:this.connect.connectPerson,
+ sonLaboratory:this.connect.sonLaboratory,
}).then(res => {
if (res.code === 200) {
this.loading = false;
this.$message.success("鎿嶄綔鎴愬姛")
- this.refreshTable()
+ this.refreshTable('page')
}
this.connectVisible = false
}).catch(error => {
console.error(error)
this.loading = false;
})
- }else{
- this.$message.error('鏈�夋嫨浜ゆ帴浜哄憳')
- }
},
handleReview(row){
this.state = 2;
--
Gitblit v1.9.3