From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspect-order-plan.vue | 226 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 148 insertions(+), 78 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 9ad143a..2b397b2 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -4,6 +4,29 @@
color: #3A7BFA
}
+ .search {
+ background-color: #fff;
+ height: 80px;
+ display: flex;
+ align-items: center;
+ }
+
+ .search_thing {
+ display: flex;
+ align-items: center;
+ height: 50px;
+ }
+
+ .search_label {
+ width: 120px;
+ font-size: 14px;
+ text-align: right;
+ }
+
+ .search_input {
+ width: calc(100% - 120px);
+ }
+
.ins-order-plan-main .search {
width: 100%;
margin-bottom: 10px;
@@ -60,9 +83,9 @@
.center .center-options .center-title {
width: 100%;
- text-align: right;
display: flex;
align-items: center;
+ justify-content: right;
}
.center .center-options .center-title span:last-child {
@@ -82,52 +105,55 @@
</style>
<template>
<div class="ins-order-plan-main">
- <p style="font-size: 16px;padding:19.5px 0px" v-show="state==0">妫�楠屼换鍔�</p>
- <div class="search" v-show="state==0">
- <el-form :inline="true" :model="searchForm" class="form-inline">
- <el-form-item label="鏍峰搧鍚嶇О:">
- <el-input clearable v-model="searchForm.sampleName" size="small" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵��:">
- <el-select clearable size="small" v-model="searchForm.state" placeholder="璇烽�夋嫨">
- <el-option v-for="(item,index) in insStateList" :key="index" :label="item.label"
- :value="item.value"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button size="small" @click="onReset">閲嶇疆</el-button>
- <el-button size="small" type="primary" @click="onSubmit">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- </div>
- <div class="center" v-show="state==0">
- <div class="center-options">
- <el-row>
- <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>
- </ul>
- <div>
- <el-checkbox @change="changeCheckBox" class="view-self-checkbox"
- v-model="viewSelf"><span>鎴戠殑浠诲姟</span></el-checkbox>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div class="center-title">
- <span>鎬昏浠诲姟鏁伴噺:</span>
- <span v-if="$refs.insOrderPlan != undefined">{{$refs.insOrderPlan.total}}</span>
- </div>
- </el-col>
- </el-row>
+ <div v-show="activeFace == 0&&state==0" style="height: 100%;">
+ <p style="font-size: 16px;padding:19.5px 0px">妫�楠屼换鍔�</p>
+ <div class="search">
+ <div class="search_thing">
+ <div class="search_label">濮旀墭缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">妫�楠岀姸鎬侊細</div>
+ <div class="search_input">
+ <el-select size="small" v-model="componentData.entity.insState" style="width: 100%;" @change="refreshTable()">
+ <el-option v-for="(a, i) in insStateList" :key="i" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="search_thing" style="padding-left: 30px;">
+ <el-button size="small" @click="refresh()">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ </div>
</div>
- <ValueTable :tableRowClassName="changeRowClass" class="value-table" ref="insOrderPlan"
- :url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData"
- :key="upIndex" @upUser="upUser" />
+ <div class="center">
+ <div class="center-options">
+ <el-row>
+ <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>
+ </ul>
+ <div>
+ <el-checkbox @change="changeCheckBox" class="view-self-checkbox"
+ v-model="alone"><span>鎴戠殑浠诲姟</span></el-checkbox>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="3">
+ <div class="center-title">
+ <span>鎬昏浠诲姟鏁伴噺:</span>
+ <span v-if="$refs.insOrderPlan != undefined">{{$refs.insOrderPlan.total}}</span>
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <ValueTable :tableRowClassName="changeRowClass" class="value-table" ref="insOrderPlan"
+ :url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData" @handleInspection="handleInspection"
+ :key="upIndex"/>
+ </div>
</div>
- <Inspection v-if="state==1" @goback="state=0"/>
<el-dialog title="鎻愮ず" :visible.sync="claimVisible" width="400px">
鏄惁璁ら濮旀墭缂栧彿<span style="color:#33C130">{{sampleUserForm.entrustCode}}</span>鐨勪换鍔�
<span slot="footer" class="dialog-footer">
@@ -135,6 +161,10 @@
<el-button type="primary" @click="confirmClaim">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <div style="width: 100%;height: 100%;" v-if="activeFace >0">
+ <Add :active="activeFace" :currentId="currentId"/>
+ </div>
+ <Inspection v-if="state==1" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory"/>
</div>
</template>
@@ -144,49 +174,45 @@
import {
getYearAndMonthAndDays
} from '../../util/date'
+ import Add from '../do/b1-ins-order/add.vue'
+import { number } from 'echarts'
export default {
components: {
ValueTable,
- Inspection
+ Inspection,
+ Add
},
data() {
return {
- viewSelf: false,
+ alone: false,
sampleUserForm: {
entrustCode: null,
insSampleId: null,
userId: null
},
claimVisible: false,
- searchForm: {
- sampleName: null,
- state: null
- },
tabList: [],
active: 1,
tabIndex: 0,
componentData: {
entity: {
- viewSelf: false,
- state: 1,
sonLaboratory: null,
insState: null,
- sampleName: null,
- orderBy: {
- field: 'type',
- order: 'desc'
- }
+ userId: null
},
isIndex: true,
showSelect: false,
select: false,
sort: false,
+ init: false,
do: [{
id: '',
font: '妫�楠�',
type: 'text',
- method: '',
- field: []
+ method: 'handleInspection',
+ disabFun: (row, index) => {
+ return row.userId == null
+ }
}, {
id: '',
font: '浜ゆ帴',
@@ -204,16 +230,36 @@
type: 'text',
method: 'claimFun',
disabFun: (row, index) => {
- return row.sampleUserId != null
+ return row.userId != null
}
}
],
+ linkEvent: {
+ entrustCode: {
+ method: 'selectAllByOne'
+ }
+ },
tagField: {
type: {
select: []
},
insState: {
select: []
+ },
+ insResult: {
+ select: [{
+ value: 0,
+ label: '涓嶅悎鏍�',
+ type: 'danger'
+ },{
+ value: 1,
+ label: '鍚堟牸',
+ type: 'success'
+ },{
+ value: '',
+ label: '鏈嚭缁撴灉',
+ type: 'info'
+ }]
}
},
selectField: {},
@@ -223,29 +269,35 @@
upIndex: 0,
planTotal: 0,
insStateList: [],
- state:0//0:鍙拌处椤碉紝1锛氭楠岄〉闈紝榛樿涓�0
+ state:0,//0:鍙拌处椤碉紝1锛氭楠岄〉闈紝榛樿涓�0
+ activeFace: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
+ currentId: null,
+ entityCopy: {},
+ orderId: 0,
}
},
created() {
+ this.getLaboratoryDicts()
this.getTypeDicts()
this.getInsStateDicts()
- this.getLaboratoryDicts()
- this.$nextTick(() => {
- this.refreshTable()
- })
+ },
+ mounted() {
+ this.entityCopy = this.HaveJson(this.componentData.entity)
},
methods: {
- upUser() {
-
- },
changeCheckBox(val) {
- this.componentData.entity.viewSelf = val
- this.$nextTick(() => {
- this.refreshTable()
- })
+ this.componentData.entity.userId = val?0:null
+ this.refreshTable()
+ },
+ refresh() {
+ this.componentData.entity = this.HaveJson(this.entityCopy)
+ if(this.tabList.length>0){
+ this.tabIndex = 0
+ this.componentData.entity.sonLaboratory = this.tabList[0].value
+ }
+ this.refreshTable()
},
claimFun(row) {
- console.log(row)
if (row) {
this.sampleUserForm = {
entrustCode: row.entrustCode,
@@ -253,7 +305,6 @@
}
this.claimVisible = true
}
-
},
confirmClaim() {
this.$axios.post(this.$api.insOrderPlan.claimInsOrderPlan, this.sampleUserForm, {
@@ -278,9 +329,9 @@
rowIndex
}) {
let currentTime = getYearAndMonthAndDays()
- if (row.sendTime && currentTime === row.sendTime) {
+ if (currentTime === row.appointed) {
return 'highlight-warning-row-border'
- } else if (row.sendTime && currentTime > row.sendTime) {
+ } else if (currentTime > row.appointed) {
return 'highlight-danger-row-border'
}
return ''
@@ -352,8 +403,27 @@
value: ele.value
}
})
+ if(this.tabList.length>0){
+ this.componentData.entity.sonLaboratory = this.tabList[0].value
+ }
+ this.refreshTable()
})
- }
+ },
+ selectAllByOne(row) {
+ this.activeFace = 2;
+ this.currentId = parseInt(row.id)
+ },
+ playOrder(num) {
+ this.activeFace = num
+ },
+ goback() {
+ this.state = 0
+ this.refreshTable()
+ },
+ handleInspection(row){
+ this.state = 1;
+ this.orderId = row.id
+ }
}
}
</script>
--
Gitblit v1.9.3