From ef408d6a8bbef12d1df69fd5b0ca61849ff25853 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 八月 2024 17:31:53 +0800
Subject: [PATCH] 设备新增bug修改
---
src/components/view/b1-inspection-order.vue | 220 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 178 insertions(+), 42 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 0c6869f..1f25b27 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -182,7 +182,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.sample" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.sampleName" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
@@ -234,12 +234,11 @@
</div>
<div class="table">
<ul class="tab">
- <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
+ <li v-for="(m,i) in tabList" :key="i+'afgh'" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
</ul>
<ValueTable :style="getStyle()" ref="ValueTable"
- :isColumnWidth="true"
:url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
- :key="'b'+upIndex" />
+ :upIndex="upIndex" />
</div>
<!-- 瀹℃牳 -->
<el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -283,7 +282,7 @@
</el-dialog>
<!-- 涓嬪彂 -->
<el-dialog title="妫�楠屽垎閰�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
- <div class="body" style="max-height: 60vh;">
+ <div class="body" style="max-height: 60vh;" v-if="issuedDialogVisible">
<el-row>
<el-col class="search_thing" style="width: 95%;">
<div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
@@ -294,19 +293,19 @@
</div>
</el-col>
<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_label">鎸囨淳浜哄憳锛�</div>
<div class="search_input">
<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 v-for="(item,i) in personList" :key="i+'gbnm.'" :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">
+ <el-col class="search_thing" style="width: 95%;">
<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 v-for="(item,i) in sonLaboratoryList" :key="i+'oooo'" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -322,13 +321,25 @@
</el-dialog>
<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"
+ <ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
:componentData="componentDataDataLook"/>
</div>
</el-dialog>
+ <el-dialog :title="deleteTilte" :visible.sync="deleteDialogVisible" width="80%">
+ <div style="height: 70vh;overflow-y: auto;" v-if="deleteDialogVisible">
+ <ValueTable ref="ValueTableDataDelete" :url="$api.insOrder.selectNoProducts+'?orderId='+orderId+'&ids='+this.revocationInsProductIds"
+ :componentData="componentDataDelete" :isColumnWidth="true"/>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="handleNo">{{deleteTilte=='鎾ら攢'?'鍙� 娑�':'涓嶉�氳繃'}}</el-button>
+ <el-button type="primary" @click="submitDelete" :loading="printLoading">{{deleteTilte=='鎾ら攢'?'纭� 瀹�':'閫� 杩�'}}</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
- <Add :active="active" :currentId="currentId" v-if="active<4" />
+ <Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
</div>
<el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="40%" top="5vh">
<div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
@@ -339,7 +350,7 @@
v-model="checkAll"
@change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
<el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
- <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
+ <el-card class="box-card" v-for="(item, i) in qrData" :key="i+'wwwww'" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
<div>
<el-row style="font-size: 14px;padding-left: 20px;">
@@ -362,7 +373,7 @@
<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.sampleName }}</el-col>
+ <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
<el-col style="font-weight: bold;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
@@ -389,31 +400,31 @@
</span>
</el-dialog>
<div class="el-dialog__body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;display: none;">
- <div id="printMOrder" class="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.16cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
+ <div id="printMOrder" class="printMOrder" ref="printMOrder">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" style="font-size: 0.20cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
<div style="display: flex;">
<div>
<el-col :span="10" :offset="2">
<vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 0.32cm;line-height: 0.21cm;">
+ <div style="margin-left: 0.32cm;line-height: 0.22cm;">
<el-row>
- <el-col style="font-size: 0.16cm;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col style="font-size: 0.20cm;width: 4cm;" class="single-line-ellipsis"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;">
+ <el-row style="font-size: 0.20cm;">
<el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;">
+ <el-row style="font-size: 0.20cm;">
<el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;">
- <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
+ <el-row style="font-size: 0.20cm;">
+ <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;width: 5.6cm;">
+ <el-row style="font-size: 0.20cm;width: 4cm;">
<el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
- <el-row style="margin-top: 0.01cm;font-size: 0.16cm;">
+ <el-row style="margin-top: 0.01cm;font-size: 0.20cm;">
<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>寰呮
@@ -448,6 +459,9 @@
},
data() {
return {
+ deleteTilte:'鎾ら攢',
+ examine: null,
+ deleteList:[],
loadPint:false,
checkAll: false,
isIndeterminate: true,
@@ -485,10 +499,10 @@
name:null,
engineering:null,
production:null,
- orderBy: {
- field: 'id',
- order: ''
- }
+ // orderBy: {
+ // field: '',
+ // order: ''
+ // }
},
isIndex: true,
showSelect: true,
@@ -526,12 +540,22 @@
disabFun: (row, index) => {
return row.state != 1 && row.state != 0
}
+ },
+ {
+ id: 'quashCheck',
+ font: '鎾ら攢瀹℃牳',
+ type: 'text',
+ method: 'handlEquashCheck',
+ disabFun: (row, index) => {
+ return (row.state != 1 && row.state != 0)||(this.tabIndex!=1)||row.isRevocation!=1
+ }
}, {
font: '鍒嗛厤',
type: 'text',
method: 'handleIssued',
disabFun: (row, index) => {
- return row.state != 1 || row.assign
+ // return row.state != 1 || !!row.assign
+ return row.appointed || row.state != 1
}
}],
linkEvent: {
@@ -594,6 +618,8 @@
requiredUp: [],
needSort: ['createTime', 'sendTime', 'type', 'appointed']
},
+ orderId:'',
+ revocationInsProductIds:'',
componentDataDataLook: {
entity: {
id: 0,
@@ -619,6 +645,10 @@
value: 0,
label: '涓嶅悎鏍�',
type: 'danger'
+ },{
+ value: 3,
+ label: '涓嶅垽瀹�',
+ type: ''
}]
}
},
@@ -642,6 +672,42 @@
requiredAdd: [],
requiredUp: []
},
+ componentDataDelete: {
+ entity: {
+ // orderId: '',
+ // orderBy: {
+ // field: 'sampleCode',
+ // order: 'asc'
+ // }
+ },
+ isPage:false,
+ isIndex: false,
+ showSelect: true,
+ select: true,
+ selectMethod: 'selectDelete',
+ do: [],
+ tagField: {
+ insState: {
+ select: []
+ },
+ insResult: {
+ select: [{
+ value: 1,
+ label: '鍚堟牸',
+ type: 'success'
+ },{
+ value: 0,
+ label: '涓嶅悎鏍�',
+ type: 'danger'
+ }]
+ }
+ },
+ selectField: {},
+ spanConfig:{},
+ requiredAdd: [],
+ requiredUp: []
+ },
+ deleteDialogVisible:false,
entityCopy: {},
upIndex: 0,
addPower: true,
@@ -757,7 +823,7 @@
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px collapse;
+ size: 400px 75px collapse;
margin-top:3px;
&:first-of-type{
margin-top:0 !important;
@@ -767,13 +833,13 @@
zoom:100%;
}
@media print{
- width: 360px;
- height: 175px;
+ width: 400px;
+ height: 75px;
margin:0;
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '0.16cm',
+ font_size: '0.20cm',
});
},
print(){
@@ -812,6 +878,7 @@
let add = false
let revoke = false
let check = false
+ let checkUpdate = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upInsOrder') {
up = true
@@ -822,11 +889,17 @@
if (power[i].menuMethod == 'updateStatus') {
revoke = true
}
- if (power[i].menuMethod == 'upInsOrderOfState') {
+ if (power[i].menuMethod == 'upInsOrderOfState2') {
check = true
+ }
+ if (power[i].menuMethod == 'checkUpdate') {
+ checkUpdate = true
}
}
if (!up) {
+ this.componentData.do.splice(5, 1)
+ }
+ if (!checkUpdate) {
this.componentData.do.splice(4, 1)
}
if (!revoke) {
@@ -861,6 +934,7 @@
// //澶嶅埗缁檉ormData
// this.formData = this.HaveJson(row);
this.currentId = row.id
+ this.examine = 1
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
@@ -884,12 +958,76 @@
// this.verifyDialogVisible = true;
this.active = 3;
this.currentId = row.id
+ this.examine = 1
},
// 鎾ら攢
handlEquash(row) {
- this.quashDialogVisible = true;
- this.insOrderRow=row
+ if(this.tabIndex!=1){
+ this.quashDialogVisible = true;
+ this.insOrderRow=row
+ }else{
+ // this.componentDataDelete.entity.orderId = row.id
+ this.orderId = row.id
+ this.revocationInsProductIds = ''
+ this.componentDataDelete.showSelect= true
+ this.componentDataDelete.select= true
+ this.deleteTilte = '鎾ら攢'
+ this.deleteDialogVisible = true;
+ }
},
+ selectDelete(arr){
+ this.deleteList = arr;
+ },
+ submitDelete(){
+ if(this.deleteTilte=='鎾ら攢'){
+ if(this.deleteList.length==0){
+ this.$message.error('璇烽�夋嫨瑕佹挙閿�鐨勯」')
+ return
+ }
+ let ids = this.deleteList.map(m=>m.id).join(',')
+ this.printLoading = true;
+ this.axios.put(this.$api.insOrder.updateInspected+"?ids="+ids+'&orderId='+this.orderId).then(res=>{
+ if (res.code===200){
+ this.printLoading=false
+ this.deleteDialogVisible=false
+ this.refreshTable('page')
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }else{
+ this.axios.post(this.$api.insOrder.checkUpdate+'?orderId='+this.orderId+'&state='+1).then(res=>{
+ if (res.code===200){
+ this.printLoading=false
+ this.deleteDialogVisible=false
+ this.refreshTable('page')
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }
+ },
+ handlEquashCheck(row){
+ // this.componentDataDelete.entity.orderId = row.id
+ this.orderId = row.id
+ this.revocationInsProductIds = row.revocationInsProductIds
+ this.componentDataDelete.showSelect= false
+ this.componentDataDelete.select= false
+ this.deleteTilte = '鎾ら攢瀹℃牳'
+ this.deleteDialogVisible = true;
+ },
+ handleNo(){
+ if(this.deleteTilte=='鎾ら攢'){
+ this.deleteDialogVisible=false
+ }else{
+ this.axios.post(this.$api.insOrder.checkUpdate+'?orderId='+this.orderId+'&state='+0).then(res=>{
+ if (res.code===200){
+ this.printLoading=false
+ this.deleteDialogVisible=false
+ this.refreshTable('page')
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }
+ },
// 涓嬪彂
handleIssued(row) {
this.issuedDialogVisible = true;
@@ -920,12 +1058,7 @@
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=='')){
+ if(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory==''){
this.$message.error('璇曢獙瀹ゆ湭濉啓')
return
}
@@ -981,12 +1114,14 @@
// 涓嬪崟
playOrder(num) {
this.active = num
+ this.examine = 0
this.refreshTable('page')
},
handleTab(m, i) {
this.tabIndex = i;
this.componentData.entity.state = m.value
- this.refreshTable()
+ this.refreshTable('page')
+ this.upIndex++
},
getUserMenu() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
@@ -1017,6 +1152,7 @@
}
})
this.componentDataDataLook.tagField.insState.select = data
+ this.componentDataDelete.tagField.insState.select = data
})
},
selectEnumByCategoryForOrderType() {
--
Gitblit v1.9.3