From 07a41ade45c962e93a9d449ce1be0eec52e66a6a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 19 三月 2025 10:44:32 +0800
Subject: [PATCH] 内部单不能修改报告
---
src/components/view/b1-inspection-order.vue | 613 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 467 insertions(+), 146 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 3aee027..5a5db44 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -152,6 +152,19 @@
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>
@@ -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,12 @@
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 class="search_label">璁㈠崟绫诲瀷锛�</div>
+ <div class="search_input">
+ <el-select v-model="componentData.entity.formType" size="small" style="width: 100%;" @change="refreshTable()">
+ <el-option v-for="(a,ai) in formType" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </div>
</div>
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
@@ -195,6 +211,11 @@
v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
+ <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%;" v-if="more">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker style="width:100%" v-model="componentData.entity.createTime"
@@ -206,6 +227,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>
@@ -234,12 +286,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 +334,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 +345,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,10 +373,86 @@
</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="鏁版嵁鏌ョ湅"
+ :visible.sync="lookDialogVisible"
+ width="60%"
+ :append-to-body="true"
+ :modal="!lookDialogVisible0"
+ >
+ <div style="max-height: 75vh;overflow-y: auto;">
+ <template v-for="(a,b) in sampleList">
+ <el-divider></el-divider>
+ <p style="margin: 10px 0;font-weight: 700;">鏍峰搧锛�<el-tag size="small">{{a.insSample.sample}}</el-tag> 鏍峰搧缂栧彿锛歿{a.insSample.sampleCode}}</p>
+ <el-card class="box-card" style="margin-top: 16px;" v-for="(item,index) in a.historyList" :key="index">
+ <div slot="header" style="display: flex;justify-content: space-between;">
+ <span>{{ item.laboratory }}</span>
+ </div>
+ <el-table
+ :data="item.insOrderUserList"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="submitTime"
+ label="鎻愪氦鏃ユ湡"
+ min-width="150">
+ </el-table-column>
+ <el-table-column
+ prop="submitUserName"
+ label="鎻愪氦浜�"
+ min-width="90">
+ </el-table-column>
+ <el-table-column
+ prop="term"
+ label="瀹為獙闃舵"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ prop="note"
+ label="瀹為獙鎿嶄綔"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ prop="tell"
+ label="鍐嶆妫�楠屽師鍥�"
+ min-width="120">
+ </el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ min-width="100">
+ <template slot-scope="scope">
+ <el-button @click="lookDetail(item,scope.row.num,a.insSample)" type="text" size="small">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ <p v-if="a.historyList.length==0" style="text-align: center;">鏆傛棤妫�楠屾暟鎹�</p>
+ </template>
+ </div>
+ </el-dialog>
+ <el-dialog
+ title="妫�楠岃鎯�"
+ :visible.sync="lookDialogVisible0"
+ width="100%" :fullscreen="true" :modal="false" :append-to-body="true">
+ <Inspection v-if="lookDialogVisible0"
+ :orderId="sampleId"
+ :orderId0="orderId0"
+ :userInfo="{}"
+ :inspectorList="currentItem.inspectorList"
+ :sonLaboratory="currentItem.laboratory"
+ :state="2"
+ :orderStateId="currentItem.orderStateId"
+ :version="currentItem.version"
+ :isLook="true"
+ :num1="currentItem.num1"
+ :noBack="true"/>
+ </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"
@@ -342,53 +469,57 @@
<div style="width: 100%;height: 100%;" v-if="active >0">
<Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
</div>
- <el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="40%" top="5vh">
+ <el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="38%" top="5vh">
<div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
<div class="dia_body">
<el-checkbox
- style="margin: 10px 5px;"
+ style="margin: 10px 5px;text-align: left;"
:indeterminate="isIndeterminate"
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-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;">
- <el-col style="font-weight: bold;">{{ item.pName }}</el-col>
+ <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList" style="text-align: left;">
+ <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:-10px;left:5px"><br></el-checkbox>
+ <div>
+ <p style="text-align: center;font-size: 26px;font-weight: 700;">{{ item.sample }}锛坽{item.model}}锛�</p>
+ <p style="text-align: center;font-size: 16px;">{{ item.sampleCode }}</p>
+ <el-divider></el-divider>
+ <el-row style="font-size: 16px;">
+ <el-col :span="16" style="text-align: left;line-height: 28px;">
+ <p><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</p>
+ <p><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</p>
+ <p><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</p>
+ <p><span> 鏍锋満鍛�: </span>{{ item.issueName }}</p>
+ <p class="ellipsis-multiline"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</p>
+ </el-col>
+ <el-col :span="8" style="text-align: left;">
+ <vueQr
+ :text="item.str"
+ :size="140"
+ :margin="2"
+ ></vueQr>
+ </el-col>
+ </el-row>
+ <!-- <div>
+ <div>
+ <el-row style="font-size: 16px;">
+ <el-col :span="16" style="text-align: left;"><span> 鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
- <div style="display: flex;">
- <div>
- <el-col :span="8" :offset="4">
- <vueQr :text="JSON.stringify(item.sampleCode)" :size="140" :margin="2"></vueQr>
- </el-col>
- </div>
- <div style="margin-left: 50px;width: 100%;">
- <el-row>
- <el-col style="font-weight: bold;font-size: 14px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
- </el-row>
- <el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- </el-row>
- <el-row style="margin-top: 1px;font-size: 14px;">
- <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-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>
- </el-row>
- <el-row style="margin-top: 3px;font-size: 14px;">
- <el-col style="font-weight: bold;display: flex;align-items: center;"><span>鏍峰搧鐘舵��: </span><el-radio-group :value="item.insState" style="margin-top: 7px;margin-left: 4px;" disabled>
- <el-radio :label="0" style="font-weight: bold;margin-right: 7px;">寰呮</el-radio>
- <el-radio :label="1" style="font-weight: bold;margin-right: 7px;">鍦ㄦ</el-radio>
- <el-radio :label="2" style="font-weight: bold;margin-right: 7px;">宸叉</el-radio>
- </el-radio-group><el-radio :label="1" style="font-weight: bold;margin-top: 7px;" v-model="item.isLeave" disabled>鐣欐牱</el-radio></el-col>
- </el-row>
- </div>
+ <el-row style="margin-top: 1px;font-size: 16px;">
+ <el-col :span="16" style="text-align: left;"><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 1px;font-size: 16px;">
+ <el-col :span="16" style="text-align: left;"><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
+ <el-col style="text-align: left;"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ </el-row>
</div>
- </div>
+ </div> -->
+ </div>
</el-card>
</el-checkbox-group>
</div>
@@ -400,64 +531,89 @@
</el-row>
</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 class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;display: none;">
<div id="printMOrder" class="printMOrder" ref="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" 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.22cm;">
- <el-row>
- <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.20cm;">
- <el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- </el-row>
- <el-row style="font-size: 0.20cm;">
- <el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
- </el-row>
- <el-row style="font-size: 0.20cm;">
- <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</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: 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>寰呮
- <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-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" style="font-size: 16px !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
+ <div>
+ <p style="text-align: center;font-size: 26px;font-weight: 700;margin-top: 20px;">{{ item.sample }}锛坽{item.model}}锛�</p>
+ <p style="text-align: center;font-size: 16px;">{{ item.sampleCode }}</p>
+ <!-- <el-divider></el-divider> -->
+ <p style="width: 100%;height:1px;background-color: #333333;margin: 6px 0;"></p>
+ <el-row style="font-size: 16px;">
+ <el-col :span="16" style="text-align: left;line-height: 28px;">
+ <p><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</p>
+ <p><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</p>
+ <p><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</p>
+ <p><span> 鏍锋満鍛�: </span>{{ item.issueName }}</p>
+ <p class="ellipsis-multiline"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</p>
+ </el-col>
+ <el-col :span="8" style="text-align: left;">
+ <vueQr
+ :text="item.str"
+ :size="140"
+ :margin="2"
+ ></vueQr>
+ </el-col>
</el-row>
</div>
- </div>
</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>
+ <el-dialog title="鎶ュ憡涓嬭浇" :visible.sync="downVisible" width="440px">
+ <p v-for="(item,index) in downList" :key="index" style="text-align: left;">鏍峰搧缂栧彿锛歿{item.codeUrl}} <el-button type="text" icon="el-icon-download" @click="handleDown(item)">鎶ュ憡涓嬭浇</el-button></p>
+ </el-dialog>
</div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
export default {
components: {
ValueTable,
+ Inspection,
Add,
vueQr
},
+ props:{
+ param: {
+ type: Object,
+ default: () => {}
+ }
+ },
data() {
return {
deleteTilte:'鎾ら攢',
@@ -500,11 +656,16 @@
name:null,
engineering:null,
production:null,
+ appointed:null,
+ issueTime:null,
+ motorNumber:null,
+ formType:null,
// orderBy: {
// field: '',
// order: ''
// }
},
+ init:false,
isIndex: true,
showSelect: true,
select: true,
@@ -523,7 +684,7 @@
type: 'text',
method: 'download',
disabFun: (row, index) => {
- return row.state != 4 || row.reportId == null
+ return !row.reportDtos||row.reportDtos.length==0
}
}, {
id: 'verify',
@@ -531,7 +692,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',
@@ -550,14 +725,17 @@
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
- }
- }],
+ },
+ // {
+ // font: '鍒嗛厤',
+ // type: 'text',
+ // method: 'handleIssued',
+ // disabFun: (row, index) => {
+ // // return row.state != 1 || !!row.assign
+ // return row.appointed || row.state != 1
+ // }
+ // }
+ ],
linkEvent: {
sampleName: {
method: 'selectAllByOne'
@@ -645,6 +823,10 @@
value: 0,
label: '涓嶅悎鏍�',
type: 'danger'
+ },{
+ value: 3,
+ label: '涓嶅垽瀹�',
+ type: ''
}]
}
},
@@ -734,14 +916,23 @@
more:false,
insOrderRow:{},
checkIndexList:[],
- checkDataList:[
- {
- sampleCode:'11111'
- }
- ],
+ checkDataList:[],
qrData:[],
multipleSelection:[],
- sonLaboratoryList:[]
+ sonLaboratoryList:[],
+ currentRole:'',
+ BZinfo:[],
+ BZDialogVisible:false,
+ downVisible:false,
+ downList:[],
+ formType:[],
+ currentInfo:{},
+ sampleList:[],
+ lookDialogVisible:false,
+ lookDialogVisible0:false,
+ sampleId:null,
+ orderId0:null,
+ currentItem:{},
}
},
watch:{
@@ -752,19 +943,97 @@
this.checkDataList = []
this.isIndeterminate = true;
}
+ },
+ param(val){
+ if(val&&val.text){
+ this.componentData.entity.entrustCode = this.param.text
+ this.componentData.entity.state = 1;
+ this.tabIndex = 1;
+ this.refreshTable()
+ }
}
+ },
+ created() {
+ this.getAuthorizedPersonRole()
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
+ if(this.param&&this.param.text){
+ this.componentData.entity.entrustCode = this.param.text
+ this.componentData.entity.state = 1;
+ this.tabIndex = 1;
+ this.refreshTable()
+ }else{
+ this.refreshTable()
+ }
this.getPower()
this.getUserMenu()
this.getAuthorizedPerson()
this.getInsStateDicts()
this.selectEnumByCategoryForOrderType()
+ this.selectEnumByCategoryForSampleForm()
},
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;
@@ -776,12 +1045,18 @@
this.loadPint = false;
let arr1 = []
a.insProduct.forEach(b=>{
- arr1.push(b.inspectionItem)
+ arr1.push(b.inspectionItemSubclass)
})
a.item = [...new Set(arr1)].join(',')
})
- this.qrData = arr
- console.log(this.qrData)
+ this.qrData = arr.map(m=>{
+ m.str = JSON.stringify({
+ sampleCode:m.sampleCode,
+ entrustCode:m.code
+ })
+ return m
+ })
+ // console.log(this.qrData)
})
},
//閫夋嫨瑕佹墦鍗扮殑浜岀淮鐮�
@@ -811,41 +1086,34 @@
this.$message.warning("璇烽�夋嫨瑕佹墦鍗扮殑浜岀淮鐮�")
return
}
- this.printDialogVisible = false;
PrintJS({
- printable: 'printMOrder',//椤甸潰
- type: "html",//鏂囨。绫诲瀷
- maxWidth:360,
- targetStyles:['*'],
- style: `@page {
- margin:0;
- size: 400px 75px collapse;
- margin-top:3px;
- &:first-of-type{
- margin-top:0 !important;
- }
- }
- html{
- zoom:100%;
- }
- @media print{
- width: 400px;
- height: 75px;
- margin:0;
- }`,
- onPrintDialogClose: this.erexcel=false,
- targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '0.20cm',
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ printable: 'printMOrder',//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ documentTitle: "浜岀淮鐮�",
+ style:
+ `@page {
+ margin: 0;
+ size: landscape;
+ }
+ body{
+ zoom:100%;
+ padding:30px 0;
+ margin:0;
+ }`,
});
},
- 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 => {
@@ -859,11 +1127,19 @@
this.personList = data
})
},
+ getAuthorizedPersonRole() {
+ this.$axios.get(this.$api.role.getRole).then(res => {
+ this.currentRole = res.message
+ })
+ },
refreshTable(e) {
this.$refs['ValueTable'].selectList(e)
},
refresh() {
+ let state = this.componentData.entity.state
this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.componentData.entity.state = state
+ this.refreshTable()
this.upIndex++
},
// 鏉冮檺鍒嗛厤
@@ -885,7 +1161,7 @@
if (power[i].menuMethod == 'updateStatus') {
revoke = true
}
- if (power[i].menuMethod == 'upInsOrderOfState') {
+ if (power[i].menuMethod == 'upInsOrderOfState2') {
check = true
}
if (power[i].menuMethod == 'checkUpdate') {
@@ -930,14 +1206,55 @@
// //澶嶅埗缁檉ormData
// this.formData = this.HaveJson(row);
this.currentId = row.id
+ this.examine = 1
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
- this.componentDataDataLook.entity.id = row.id
- this.dataDialogVisible = true;
+ // this.componentDataDataLook.entity.id = row.id
+ // this.dataDialogVisible = true;
+
+ this.currentInfo = row
+ this.$axios.get(this.$api.insReport.getInsOrderStateCount+'?id='+row.id).then(res => {
+ this.sampleList = res.data
+ this.sampleList.forEach(a=>{
+ a.historyList = a.insOrderStates
+ a.historyList.forEach(item => {
+ item.arr = []
+ this.$set(item,'numValue',1)
+ if(item.num>0){
+ for(var i=0;i<item.num;i++){
+ item.arr.push({
+ label:'璁板綍'+(i+1),
+ value:i+1
+ })
+ }
+ }
+ })
+ })
+ this.lookDialogVisible = true
+ })
},
+ // 鏌ョ湅妫�楠岃鎯�
+ lookDetail(row,value,insSample){
+ this.lookDialogVisible0 = true
+ let inspectorList = []
+ if(row.userName){
+ inspectorList = row.userName.split(',')
+ }
+ this.sampleId = insSample.id
+ this.orderId0 = insSample.insOrderId
+ this.currentItem = {
+ num1:value,
+ inspectorList:inspectorList,
+ ...row
+ }
+ },
// 涓嬭浇鎶ュ憡
download(row) {
+ this.downList = row.reportDtos
+ this.downVisible = true;
+ },
+ handleDown(row){
let url = row.urlS?row.urlS:row.url;
if(url){
url = url.split('.')[0]+'.pdf'
@@ -1053,12 +1370,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
}
@@ -1115,13 +1427,22 @@
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++
},
+ selectEnumByCategoryForSampleForm() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "璁㈠崟绫诲瀷"
+ }).then(res => {
+ this.formType = res.data
+ })
+ },
getUserMenu() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
--
Gitblit v1.9.3