From ae8b90c76912a7796b7c23c78f1a59bac434457d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 14 十月 2024 13:37:15 +0800
Subject: [PATCH] 完成普通项目的项目检验
---
src/components/view/b1-inspection-order.vue | 482 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 420 insertions(+), 62 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index fcfbf6c..8778c55 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -135,8 +135,8 @@
border: none !important;
}
.scor{
- width: 3px;
- height: 3px;
+ width: 0.01cm;
+ height: 0.01cm;
border-radius: 1px;
border: 1px solid #000;
display: inline-block;
@@ -152,11 +152,24 @@
line-height: 1.5em; /* 琛岄珮 */
height: 3.0em; /* 楂樺害涓鸿楂樼殑涓ゅ�� */
}
+ .thermal-table{
+ min-width: calc(100% - 10px);
+ margin: 5px 5px 0;
+ table-layout: fixed;
+ }
+ .thermal-table td {
+ min-width: 70px;
+ text-align: center;
+ font-size: 14px;
+ word-wrap: break-word;
+ white-space: normal;
+ padding: 5px;
+ }
</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;text-align: left;">妫�楠屼笅鍗�</el-col>
@@ -166,7 +179,7 @@
</el-col>
</el-row>
</div>
- <div class="search" :style="`height: ${more?130:80}px;`">
+ <div class="search" :style="`height: ${more?150:80}px;`">
<el-row :gutter="10" style="width: 100%;">
<el-col :span="20" style="display: flex;flex-wrap: wrap;">
<div class="search_thing" style="width: 20%;">
@@ -175,9 +188,14 @@
v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;">
+ <div class="search_label" style="width: 120px;">澶栭儴濮旀墭缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.outEntrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <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>
@@ -189,7 +207,7 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing" style="width: 20%;">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker style="width:100%" v-model="componentData.entity.createTime"
@@ -201,6 +219,37 @@
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label">绾﹀畾鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker style="width:100%" v-model="componentData.entity.appointed"
+ type="date"
+ size="small"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ clearable
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label" style="width: 130px;">鏍锋満瀹屾垚鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker style="width:100%" v-model="componentData.entity.issueTime"
+ type="date"
+ size="small"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ clearable
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label">鐢垫満缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.motorNumber" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟浜猴細</div>
@@ -229,10 +278,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" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
- :key="'b'+upIndex" />
+ <ValueTable :style="getStyle()" ref="ValueTable"
+ :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+ :upIndex="upIndex" />
</div>
<!-- 瀹℃牳 -->
<el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -276,7 +326,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>
@@ -287,10 +337,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>
- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
+ <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+'gbnm.'" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <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+'oooo'" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -306,13 +365,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">
@@ -323,7 +394,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;">
@@ -346,7 +417,10 @@
<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;">
+ <el-col style="font-weight: bold;"><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</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>
@@ -372,32 +446,35 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="overflow-y: auto;position: absolute;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 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" 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="78" :margin="2"></vueQr>
+ <vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 12px;line-height: 9px;">
+ <div style="margin-left: 0.32cm;line-height: 0.22cm;">
<el-row>
- <el-col style="font-size: 8px;"><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: 8px;">
+ <el-row style="font-size: 0.20cm;">
<el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
</el-row>
- <el-row style="font-size: 8px;">
+ <el-row style="font-size: 0.20cm;">
<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 style="font-size: 0.20cm;">
+ <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
</el-row>
- <el-row style="font-size: 8px;width: 140px;">
+ <el-row style="font-size: 0.20cm;">
+ <el-col ><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
+ </el-row>
+ <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: 3px;font-size: 8px;">
+ <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>寰呮
@@ -416,6 +493,36 @@
</el-card>
</div>
</div>
+ <el-dialog title="鏍锋満缂栧彿" :visible.sync="BZDialogVisible" width="60%">
+ <div class="body" style="max-height: 60vh;" v-if="BZDialogVisible">
+ </div>
+ <table border="1" class="thermal-table" cellpadding="10">
+ <tr>
+ <td>濮旀墭鍗曞彿</td>
+ <td>鏍峰搧</td>
+ <td>鏍峰搧缂栧彿</td>
+ <td>鏍峰搧鍨嬪彿</td>
+ <td>鐢垫満缂栧彿</td>
+ </tr>
+ <template v-for="(item,index) in BZinfo">
+ <tr v-for="(m,i) in item.arr" :key="i">
+ <td :rowspan="item.arr.length" v-if="i==0">{{item.name}}</td>
+ <td>{{ m.sample }}</td>
+ <td>{{ m.sampleCode }}</td>
+ <td>{{ m.model }}</td>
+ <td>
+ <el-input v-model="m.motorNumber" size="small"></el-input>
+ </td>
+ </tr>
+ </template>
+ </table>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="BZDialogVisible=false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm3" :loading="upLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -424,6 +531,7 @@
import Add from '../do/b1-ins-order/add.vue'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
+import { Header } from 'iview';
export default {
components: {
ValueTable,
@@ -432,6 +540,9 @@
},
data() {
return {
+ deleteTilte:'鎾ら攢',
+ examine: null,
+ deleteList:[],
loadPint:false,
checkAll: false,
isIndeterminate: true,
@@ -452,7 +563,8 @@
orderId: '',
sampleId: '',
appointed: '',
- userId: ''
+ userId: '',
+ sonLaboratory:''
},
// 浜哄憳鍒楄〃
personList: [],
@@ -463,14 +575,18 @@
sampleName: null,
sampleModel: null,
sampleCode: null,
+ outEntrustCode: null,
state: 0,
name:null,
engineering:null,
production:null,
- orderBy: {
- field: 'id',
- order: 'asc'
- }
+ appointed:null,
+ issueTime:null,
+ motorNumber:null,
+ // orderBy: {
+ // field: '',
+ // order: ''
+ // }
},
isIndex: true,
showSelect: true,
@@ -498,7 +614,21 @@
type: 'text',
method: 'handleVerify',
disabFun: (row, index) => {
- return row.state != 0
+ let state0 = false
+ if(this.currentRole=='妫�娴嬩腑蹇冧富浠�'){
+ if(row.checkState1||row.checkState1User){
+ state0 = true
+ }
+ }else if(this.currentRole=='鐮斿彂閮ㄧ粡鐞�'){
+ if(row.checkState2||row.checkState2User){
+ state0 = true
+ }
+ }else if(this.currentRole=='鎶�鏈礋璐ｄ汉'){
+ if(row.checkState3||row.checkState3User){
+ state0 = true
+ }
+ }
+ return row.state != 0 || state0 ||(this.currentRole!='妫�娴嬩腑蹇冧富浠�'&&this.currentRole!='鐮斿彂閮ㄧ粡鐞�'&&this.currentRole!='鎶�鏈礋璐ｄ汉')
}
}, {
id: 'quash',
@@ -508,14 +638,26 @@
disabFun: (row, index) => {
return row.state != 1 && row.state != 0
}
- }, {
- font: '鍒嗛厤',
+ },
+ {
+ id: 'quashCheck',
+ font: '鎾ら攢瀹℃牳',
type: 'text',
- method: 'handleIssued',
+ method: 'handlEquashCheck',
disabFun: (row, index) => {
- return row.state != 1 || row.sendTime != null
+ 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.appointed || row.state != 1
+ // }
+ // }
+ ],
linkEvent: {
sampleName: {
method: 'selectAllByOne'
@@ -573,8 +715,11 @@
},
selectField: {},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'sendTime', 'type', 'appointed']
},
+ orderId:'',
+ revocationInsProductIds:'',
componentDataDataLook: {
entity: {
id: 0,
@@ -600,6 +745,10 @@
value: 0,
label: '涓嶅悎鏍�',
type: 'danger'
+ },{
+ value: 3,
+ label: '涓嶅垽瀹�',
+ type: ''
}]
}
},
@@ -616,13 +765,49 @@
},
{
name:'model',
- index:2
+ index:5
}
]
},
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,
@@ -659,7 +844,11 @@
}
],
qrData:[],
- multipleSelection:[]
+ multipleSelection:[],
+ sonLaboratoryList:[],
+ currentRole:'',
+ BZinfo:[],
+ BZDialogVisible:false,
}
},
watch:{
@@ -672,6 +861,9 @@
}
}
},
+ created() {
+ this.getAuthorizedPersonRole()
+ },
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
@@ -683,6 +875,64 @@
methods: {
selectMethod(val){
this.multipleSelection = val
+ },
+ async searchPrint(selection){
+ let res = await this.$axios.post(this.$api.insOrder.checkNumber,{
+ ids:selection.map(m=>m.id).join(',')
+ })
+ if(res.data){
+ let arr = []
+ for(let i in res.data){
+ let obj = {
+ name:i,
+ arr:res.data[i],
+ motorNumber:null,
+ }
+ arr.push(obj)
+ }
+ this.BZinfo = arr
+ this.BZDialogVisible = true
+ return true
+ }else{
+ return false
+ }
+ },
+ submitForm3(){
+ let arr = []
+ let num = 0;
+ this.BZinfo.forEach(m=>{
+ arr = arr.concat(m.arr)
+ })
+ arr.forEach(m=>{
+ if(!m.motorNumber){
+ num++
+ }
+ })
+ if(num>0){
+ return this.$message.warning("璇疯緭鍏ョ數鏈虹紪鍙�")
+ }
+ this.upLoad = true
+ this.$axios.post(this.$api.insOrder.addNumber,{
+ insSamples:arr.map(m=>{
+ return {
+ id:m.id,
+ motorNumber:m.motorNumber
+ }
+ })
+ },{
+ header: {
+ 'Content-Type': 'application/json;charset=UTF-8',
+ },
+ noQs:true
+ }).then(res => {
+ this.upLoad = false;
+ if(res.code == 200){
+ this.BZDialogVisible = false
+ this.getLabelPrinting(this.multipleSelection)
+ this.printDialogVisible = true
+ this.refreshTable()
+ }
+ })
},
getLabelPrinting(selection){
this.loadPint = true;
@@ -737,29 +987,36 @@
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px collapse;
+ size: 400px 75px collapse;
+ margin-top:3px;
+ &:first-of-type{
+ margin-top:0 !important;
+ }
}
html{
zoom:100%;
}
@media print{
- width: 360px;
- height: 175px;
+ width: 400px;
+ height: 75px;
margin:0;
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '',
+ font_size: '0.20cm',
});
},
- print(){
+ async print(){
if(this.multipleSelection.length==0){
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
return
}
let selection = this.multipleSelection
- this.getLabelPrinting(selection)
- this.printDialogVisible = true
+ let isAdd = await this.searchPrint(selection)
+ if(!isAdd){
+ this.getLabelPrinting(selection)
+ this.printDialogVisible = true
+ }
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
@@ -773,8 +1030,13 @@
this.personList = data
})
},
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ getAuthorizedPersonRole() {
+ this.$axios.get(this.$api.role.getRole).then(res => {
+ this.currentRole = res.message
+ })
+ },
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -788,6 +1050,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
@@ -798,11 +1061,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) {
@@ -837,6 +1106,7 @@
// //澶嶅埗缁檉ormData
// this.formData = this.HaveJson(row);
this.currentId = row.id
+ this.examine = 1
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
@@ -860,12 +1130,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;
@@ -877,14 +1211,27 @@
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('鎸囨淳浜哄憳鏈～鍐�')
+ if(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory==''){
+ this.$message.error('璇曢獙瀹ゆ湭濉啓')
return
}
this.upLoad = true;
@@ -892,7 +1239,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
@@ -901,7 +1249,7 @@
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
}).catch(e => {
this.$message.error('淇敼澶辫触')
this.upLoad = false
@@ -914,7 +1262,7 @@
if (res.code===200){
this.upLoad=false
this.quashDialogVisible=false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -923,7 +1271,7 @@
if (res.code===200){
this.upLoad = false
this.quashDialogVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.$message.success("鏇存柊鎴愬姛")
}
})
@@ -938,11 +1286,15 @@
// 涓嬪崟
playOrder(num) {
this.active = num
+ this.examine = 0
+ this.getAuthorizedPersonRole()
+ 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 => {
@@ -973,6 +1325,7 @@
}
})
this.componentDataDataLook.tagField.insState.select = data
+ this.componentDataDelete.tagField.insState.select = data
})
},
selectEnumByCategoryForOrderType() {
@@ -984,6 +1337,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