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-inspection-order.vue | 189 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 170 insertions(+), 19 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d37f203..cf1c56b 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -90,17 +90,76 @@
>>>.el-radio__label{
color: #000 !important;
}
+ .el-dialog__body >>>.el-radio__label{
+ font-size: 8px;
+ }
+ .el-dialog__body >>>.el-radio__input.is-checked .el-radio__inner::after {
+ content: '';
+ width: 4px;
+ height: 3px;
+ border: 1px solid #000;
+ border-top: transparent;
+ border-right: transparent;
+ text-align: center;
+ display: block;
+ position: absolute;
+ top: 1px;
+ left: 2px;
+ transform: rotate(-45deg);
+ border-radius: 0px;
+ background: none;
+ }
>>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
background: #3A7BFA;
+ }
+ .el-dialog__body >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+ background: transparent;
+ }
+ .el-dialog__body >>>.el-radio__inner{
+ width: 8px !important;
+ height: 8px !important;
+ }
+ .el-dialog__body >>>.el-radio__label{
+ padding-left: 2px !important;
+ }
+ .el-dialog__body >>>.el-card__body{
+ padding: 0 !important;
+ }
+ .el-dialog__body >>>.el-card {
+ border: none;
+ }
+ .el-dialog__body >>>.el-radio__input.is-disabled .el-radio__inner{
+ border-color: #000 !important;
+ }
+ .el-dialog__body >>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+ border: none !important;
+ }
+ .scor{
+ width: 3px;
+ height: 3px;
+ border-radius: 1px;
+ border: 1px solid #000;
+ display: inline-block;
+ }
+ .ellipsis-multiline {
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-wrap: break-word;
+ max-height: 3.0em; /* 楂樺害涓哄瓧浣撳ぇ灏忕殑涓ゅ�� */
+ line-height: 1.5em; /* 琛岄珮 */
+ height: 3.0em; /* 楂樺害涓鸿楂樼殑涓ゅ�� */
}
</style>
<template>
<div class="inspection_order">
- <div style="width: 100%;height: 100%;" v-if="active == 0">
+ <div style="width: 100%;height: 100%;" v-show="active == 0">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="print">鏍囩鎵撳嵃</el-button>
<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
@@ -118,7 +177,7 @@
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
@@ -230,8 +289,17 @@
<el-col class="search_thing" style="width: 95%;">
<div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable>
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable @change="changeUser">
<el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <el-col class="search_thing" style="width: 95%;" v-if="distributeData.userId">
+ <div class="search_label"><span class="required-span" >* </span>璇曢獙瀹わ細</div>
+ <div class="search_input">
+ <el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable>
+ <el-option v-for="(item,i) in sonLaboratoryList" :key="i" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -287,9 +355,9 @@
<el-col style="font-weight: bold;"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О鍙�: </span>{{ item.sample }}</el-col>
+ <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
</el-row>
- <el-row style="margin-top: 1px;font-size: 14px;">
+ <el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
<el-col style="font-weight: bold;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
<el-row style="margin-top: 3px;font-size: 14px;">
@@ -313,6 +381,50 @@
</el-row>
</span>
</el-dialog>
+ <div class="el-dialog__body" style="display:none;overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
+ <div id="printMOrder">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-after: always;color: #000;box-shadow: none;" >
+ <div style="display: flex;">
+ <div>
+ <el-col :span="10" :offset="2">
+ <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
+ </el-col>
+ </div>
+ <div style="margin-left: 12px;line-height: 9px;">
+ <el-row>
+ <el-col style="font-size: 8px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;">
+ <el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;">
+ <el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;">
+ <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
+ </el-row>
+ <el-row style="font-size: 8px;width: 140px;">
+ <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 3px;font-size: 8px;">
+ <el-col style="display: flex;align-items: center;"><span>鏍峰搧鐘舵��:
+ </span>
+ <span style="white-space: nowrap;"><span v-if="item.insState==0">鈭�</span><span class="scor" v-if="item.insState!=0"></span>寰呮
+ <span v-if="item.insState==1">鈭�</span><span class="scor" v-if="item.insState!=1"></span>鍦ㄦ
+ <span v-if="item.insState==2">鈭�</span><span class="scor" v-if="item.insState!=2"></span>宸叉
+ <span v-if="item.isLeave==1">鈭�</span><span class="scor" v-if="item.isLeave!=1"></span>鐣欐牱</span>
+ <!-- <el-radio-group :value="item.insState" style="margin-top: 3px;margin-left: 1px;" disabled>
+ <el-radio :label="0" style="margin-right: 3px;font-size: 6px;">寰呮</el-radio>
+ <el-radio :label="1" style="margin-right: 3px;font-size: 6px;">鍦ㄦ</el-radio>
+ <el-radio :label="2" style="margin-right: 3px;font-size: 6px;">宸叉</el-radio>
+ </el-radio-group><el-radio :label="1" style="margin-top: 3px;font-size: 8px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio> -->
+ </el-col>
+ </el-row>
+ </div>
+ </div>
+ </el-card>
+ </div>
+ </div>
</div>
</template>
@@ -349,14 +461,15 @@
orderId: '',
sampleId: '',
appointed: '',
- userId: ''
+ userId: '',
+ sonLaboratory:''
},
// 浜哄憳鍒楄〃
personList: [],
componentData: {
entity: {
entrustCode: null,
- sampleType: null,
+ sample: null,
sampleName: null,
sampleModel: null,
sampleCode: null,
@@ -470,7 +583,8 @@
},
selectField: {},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'sendTime', 'type', 'appointed']
},
componentDataDataLook: {
entity: {
@@ -550,9 +664,14 @@
more:false,
insOrderRow:{},
checkIndexList:[],
- checkDataList:[],
+ checkDataList:[
+ {
+ sampleCode:'11111'
+ }
+ ],
qrData:[],
- multipleSelection:[]
+ multipleSelection:[],
+ sonLaboratoryList:[]
}
},
watch:{
@@ -626,11 +745,11 @@
PrintJS({
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
- maxWidth:450,
+ maxWidth:360,
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px landscape;
+ size: 360px 175px collapse;
}
html{
zoom:100%;
@@ -666,8 +785,8 @@
this.personList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -680,6 +799,7 @@
let del = false
let add = false
let revoke = false
+ let check = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upInsOrder') {
up = true
@@ -690,12 +810,18 @@
if (power[i].menuMethod == 'updateStatus') {
revoke = true
}
+ if (power[i].menuMethod == 'upInsOrderOfState') {
+ check = true
+ }
}
if (!up) {
this.componentData.do.splice(4, 1)
}
if (!revoke) {
this.componentData.do.splice(3, 1)
+ }
+ if (!check) {
+ this.componentData.do.splice(2, 1)
}
this.addPower = add
},
@@ -763,14 +889,32 @@
this.distributeData.appointed = res.data
this.distributeData.type = row.type
})
+ this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
+ orderId:row.id,
+ }).then(res => {
+ if (res.code === 200&&res.data.length>0) {
+ this.sonLaboratoryList = [];
+ res.data.forEach(m=>{
+ this.sonLaboratoryList.push({
+ value:m,
+ label:m
+ })
+ })
+ }
+ })
},
submitForm2() {
if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
+ //
if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
+ return
+ }
+ if(this.distributeData.userId&&(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory=='')){
+ this.$message.error('璇曢獙瀹ゆ湭濉啓')
return
}
this.upLoad = true;
@@ -778,7 +922,8 @@
orderId: this.distributeData.orderId,
sampleId: this.distributeData.sampleId,
appointed: this.distributeData.appointed,
- userId: this.distributeData.userId
+ userId: this.distributeData.userId,
+ sonLaboratory:this.distributeData.sonLaboratory,
}).then(res => {
if (res.code === 201) {
this.upLoad = false
@@ -787,7 +932,7 @@
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
}).catch(e => {
this.$message.error('淇敼澶辫触')
this.upLoad = false
@@ -800,7 +945,7 @@
if (res.code===200){
this.upLoad=false
this.quashDialogVisible=false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -809,7 +954,7 @@
if (res.code===200){
this.upLoad = false
this.quashDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -824,6 +969,7 @@
// 涓嬪崟
playOrder(num) {
this.active = num
+ this.refreshTable('page')
},
handleTab(m, i) {
this.tabIndex = i;
@@ -870,6 +1016,11 @@
},
getStyle(){
return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
+ },
+ changeUser(){
+ if(this.sonLaboratoryList.length>0){
+ this.distributeData.sonLaboratory = this.sonLaboratoryList[0].value
+ }
}
}
}
--
Gitblit v1.9.3