From 213df69780f7aa5c229d12174d8f9758f8cadd8d Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 16:30:44 +0800
Subject: [PATCH] 装备电缆-增加能力范围导入接口
---
src/components/view/b1-inspection-order.vue | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 7e989b0..238a71c 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -120,10 +120,13 @@
height: 8px !important;
}
.el-dialog__body >>>.el-radio__label{
- padding-left: 2px !important;
+ 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;
@@ -153,7 +156,7 @@
<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;text-align: left;">妫�楠屼笅鍗�</el-col>
@@ -174,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>
@@ -286,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>
@@ -369,16 +381,16 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="width:320px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;position: fixed;top: 0;display: none;">
+ <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-before:always;page-break-after: always;color: #000;">
+ <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="8" :offset="4">
+ <el-col :span="10" :offset="2">
<vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 57px;line-height: 9px;">
+ <div style="margin-left: 12px;line-height: 9px;">
<el-row>
<el-col style="font-size: 8px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
</el-row>
@@ -412,7 +424,7 @@
</div>
</el-card>
</div>
- </div>
+ </div>
</div>
</template>
@@ -449,14 +461,15 @@
orderId: '',
sampleId: '',
appointed: '',
- userId: ''
+ userId: '',
+ sonLaboratory:''
},
// 浜哄憳鍒楄〃
personList: [],
componentData: {
entity: {
entrustCode: null,
- sampleType: null,
+ sample: null,
sampleName: null,
sampleModel: null,
sampleCode: null,
@@ -651,12 +664,13 @@
insOrderRow:{},
checkIndexList:[],
checkDataList:[
- // {
- // sampleCode:'11111'
- // }
+ {
+ sampleCode:'11111'
+ }
],
qrData:[],
- multipleSelection:[]
+ multipleSelection:[],
+ sonLaboratoryList:[]
}
},
watch:{
@@ -730,11 +744,11 @@
PrintJS({
printable: 'printMOrder',//椤甸潰
type: "html",//鏂囨。绫诲瀷
- maxWidth:450,
+ maxWidth:360,
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px portrait;
+ size: 360px 175px collapse;
}
html{
zoom:100%;
@@ -770,8 +784,8 @@
this.personList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -874,14 +888,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;
@@ -889,7 +921,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
@@ -898,7 +931,7 @@
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
}).catch(e => {
this.$message.error('淇敼澶辫触')
this.upLoad = false
@@ -911,7 +944,7 @@
if (res.code===200){
this.upLoad=false
this.quashDialogVisible=false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -920,7 +953,7 @@
if (res.code===200){
this.upLoad = false
this.quashDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -935,6 +968,7 @@
// 涓嬪崟
playOrder(num) {
this.active = num
+ this.refreshTable('page')
},
handleTab(m, i) {
this.tabIndex = i;
@@ -981,6 +1015,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