From d975fc4756806f5b51f006c19c33571b9b8c0b3b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 20 十二月 2024 09:30:19 +0800
Subject: [PATCH] 修改下单时要求值输入限制
---
src/components/view/b1-inspection-order.vue | 1316 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 1,162 insertions(+), 154 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index b180ebf..5a5db44 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -9,22 +9,24 @@
height: 80px;
display: flex;
align-items: center;
+ overflow: hidden;
}
.search_thing {
- width: 350px;
display: flex;
align-items: center;
+ height: 50px;
+ width: 230px;
}
.search_label {
- width: 110px;
+ width: 90px;
font-size: 14px;
text-align: right;
}
.search_input {
- width: calc(100% - 110px);
+ width: calc(100% - 90px);
}
.table {
@@ -54,7 +56,7 @@
border-radius: 8px 0 0 8px;
}
- .tab li:nth-child(4) {
+ .tab li:nth-child(5) {
border-radius: 0 8px 8px 0;
}
@@ -66,44 +68,229 @@
.el-form-item {
margin-bottom: 16px;
}
+ .box-card >>>.el-radio__inner {
+ border-radius: 2px !important;
+ }
+ .box-card >>>.el-radio__input.is-checked .el-radio__inner::after {
+ content: '';
+ width: 8px;
+ height: 3px;
+ border: 1px solid white;
+ border-top: transparent;
+ border-right: transparent;
+ text-align: center;
+ display: block;
+ position: absolute;
+ top: 3px;
+ left: 2px;
+ transform: rotate(-45deg);
+ border-radius: 0px;
+ background: none;
+ }
+ >>>.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: 0.01cm;
+ height: 0.01cm;
+ 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; /* 楂樺害涓鸿楂樼殑涓ゅ�� */
+ }
+ .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;">妫�楠屼笅鍗�</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="playOrder(1)">涓嬪崟</el-button>
+ <el-button size="medium" type="primary" @click="print">鏍囩鎵撳嵃</el-button>
+ <el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
</el-col>
</el-row>
</div>
- <div class="search">
- <div class="search_thing">
- <div class="search_label">濮旀墭缂栧彿锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.deviceName" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing">
- <div class="search_label">鏍峰搧鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.specificationModel" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
+ <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%;">
+ <div class="search_label">濮旀墭缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.entrustCode" @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-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>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ 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>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.sampleModel" @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.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"
+ type="date"
+ size="small"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ 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-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>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.name" @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-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.engineering" @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-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div class="search_thing">
+ <el-button type="text" :icon="!more?'el-icon-arrow-down':'el-icon-arrow-up'" style="color: #3A7BFA;" @click="more=!more">{{!more?'鏇村':'鏀惰捣'}}</el-button>
+ <el-button size="small" @click="refresh()">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ </div>
+ </el-col>
+ </el-row>
</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>
- <!-- 璇硶 瀛愮粍浠堕�氳繃 this.$emit +浼犲叆鏂规硶鍚� 璋冪敤鐖剁粍浠舵柟娉� 渚嬪 this.$emit锛坰electAllByOne锛� 灏遍渶鍦ㄧ埗缁勪欢澹版槑骞朵紶鍏� @selectAllByOne="selectAllByOne"-->
- <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
- :key="upIndex" style="height: calc(100% - 44px)" @selectAllByOne="selectAllByOne"
- @handleDataLook="handleDataLook" @download="download" @handleVerify="handleVerify" @handlEquash="handlEquash"
- @handleIssued="handleIssued" />
+ <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">
@@ -128,7 +315,7 @@
<!-- 鎾ら攢 -->
<el-dialog title="涓嬪崟鎾ら攢" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose">
<p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span
- style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p>
+ style="color:#34BD66">{{this.insOrderRow.entrustCode}}</span>鐨勪俊鎭槸鍚︽挙閿�</p>
<el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
<el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�">
<el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
@@ -146,22 +333,37 @@
</span>
</el-dialog>
<!-- 涓嬪彂 -->
- <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="30%" :before-close="handleClose">
- <el-form :label-position="labelPosition" :model="formData2" label-width="150px" ref="ruleForm">
- <el-form-item label="绾﹀畾鏃堕棿锛�">
- <el-date-picker style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="formData2.appointed2"
- type="date" size="small" placeholder="閫夋嫨鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item >
- </el-form-item>
- <el-form-item label="鎸囨淳浜哄憳锛�">
- <el-select v-model="formData2.id" placeholder="璇烽�夋嫨" size="small" style="width:100%">
- <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-form>
+ <el-dialog title="妫�楠屽垎閰�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
+ <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>
+ <div class="search_input">
+ <el-date-picker size="small" v-model="distributeData.appointed" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" style="width: 100%;" format="yyyy-MM-dd">
+ </el-date-picker>
+ </div>
+ </el-col>
+ <el-col class="search_thing" style="width: 95%;">
+ <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+'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>
+ </el-col>
+ </el-row>
+ </div>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="handleClose2">鍙� 娑�</el-button>
@@ -169,29 +371,259 @@
</el-row>
</span>
</el-dialog>
- <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose2">
- <div style="height: 70vh;overflow-y: auto;">
- <ValueTable ref="ValueTableDataLook" :url="$api.deviceScope.selectDeviceParameter"
- :componentData="componentDataDataLook" :key="upIndex" />
+ <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
+ <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
+ <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"
+ :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 == 1">
- <Add/>
+ <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="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;text-align: left;"
+ :indeterminate="isIndeterminate"
+ v-model="checkAll"
+ @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
+ <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>
+ <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>
+ </el-card>
+ </el-checkbox-group>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button @click="printDialogVisible=false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitPrint" :loading="printLoading">鎵� 鍗�</el-button>
+ </el-row>
+ </span>
+ </el-dialog>
+ <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+'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>
+ </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,
- Add
+ Inspection,
+ Add,
+ vueQr
},
+ props:{
+ param: {
+ type: Object,
+ default: () => {}
+ }
+ },
data() {
return {
+ deleteTilte:'鎾ら攢',
+ examine: null,
+ deleteList:[],
+ loadPint:false,
+ checkAll: false,
+ isIndeterminate: true,
+ printLoading:false,
+ printDialogVisible:false,
//鏄惁瀹℃牳閫氳繃 true鏄� false涓嶆槸
isPass: false,
//鏄惁瀹℃牳鎾ら攢 true鏄� false涓嶆槸
@@ -199,56 +631,116 @@
verifyDialogVisible: false,
quashDialogVisible: false,
issuedDialogVisible: false,
- issuedDialogVisible2: false,
dataDialogVisible: false,
formData: {},
- formData0:{},
- formData1:{},
- formData2:{
- id:'',
- orderName:'',
- data:'',
+ formData0: {},
+ formData1: {},
+ distributeData: {
+ orderId: '',
+ sampleId: '',
+ appointed: '',
+ userId: '',
+ sonLaboratory:''
},
// 浜哄憳鍒楄〃
personList: [],
- labelPosition: 'right',
componentData: {
entity: {
- state: 1,
- orderBy: {
- field: 'id',
- order: 'asc'
- }
+ entrustCode: null,
+ sample: null,
+ sampleName: null,
+ sampleModel: null,
+ sampleCode: null,
+ outEntrustCode: null,
+ state: 0,
+ name:null,
+ engineering:null,
+ production:null,
+ appointed:null,
+ issueTime:null,
+ motorNumber:null,
+ formType:null,
+ // orderBy: {
+ // field: '',
+ // order: ''
+ // }
},
+ init:false,
isIndex: true,
- showSelect: false,
- select: false,
+ showSelect: true,
+ select: true,
+ selectMethod:'selectMethod',
do: [{
id: 'dataLook',
font: '鏁版嵁鏌ョ湅',
type: 'text',
- method: 'handleDataLook'
+ method: 'handleDataLook',
+ disabFun: (row, index) => {
+ return row.state != 1 && row.state != 4
+ }
}, {
id: 'download',
font: '鎶ュ憡涓嬭浇',
type: 'text',
- method: 'download'
+ method: 'download',
+ disabFun: (row, index) => {
+ return !row.reportDtos||row.reportDtos.length==0
+ }
}, {
id: 'verify',
font: '瀹℃牳',
type: 'text',
- method: 'handleVerify'
+ method: 'handleVerify',
+ disabFun: (row, index) => {
+ 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',
font: '鎾ら攢',
type: 'text',
- method: 'handlEquash'
- }, {
- id: 'issued',
- font: '涓嬪彂',
+ method: 'handlEquash',
+ disabFun: (row, index) => {
+ return row.state != 1 && row.state != 0
+ }
+ },
+ {
+ id: 'quashCheck',
+ font: '鎾ら攢瀹℃牳',
type: 'text',
- method: 'handleIssued'
- }],
+ 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.appointed || row.state != 1
+ // }
+ // }
+ ],
+ linkEvent: {
+ sampleName: {
+ method: 'selectAllByOne'
+ }
+ },
tagField: {
type: {
select: [{
@@ -265,21 +757,52 @@
label: '绱ф��'
}]
},
- },
- linkEvent:{
- deviceName:{
- id: 'details',
- method:'selectAllByOne',
- }
+ createUser: {
+ select: []
+ },
+ orderType: {
+ select: []
+ },
+ processing: {
+ select: [{
+ value: 1,
+ label: '瀹為獙瀹ゅ鐞�'
+ },{
+ value: 0,
+ label: '濮旀墭鍗曚綅鍙栧洖'
+ }]
+ },
+ isLeave: {
+ select: [{
+ value: 1,
+ label: '鐣欐牱'
+ },{
+ value: 0,
+ label: '涓嶇暀鏍�'
+ }]
+ },
+ send: {
+ select: [{
+ value: 1,
+ label: '鑷彇'
+ },{
+ value: 0,
+ label: '鍏朵粬'
+ }]
+ }
},
selectField: {},
- requiredAdd: ['largeCategory', 'subclass', 'deviceName', 'internalCode', 'specificationModel', 'manufacturer'],
- requiredUp: ['largeCategory', 'subclass', 'deviceName', 'internalCode', 'specificationModel', 'manufacturer']
+ requiredAdd: [],
+ requiredUp: [],
+ needSort: ['createTime', 'sendTime', 'type', 'appointed']
},
+ orderId:'',
+ revocationInsProductIds:'',
componentDataDataLook: {
entity: {
+ id: 0,
orderBy: {
- field: 'id',
+ field: 'sampleCode',
order: 'asc'
}
},
@@ -288,37 +811,95 @@
select: false,
do: [],
tagField: {
- deviceStatus: {
+ insState: {
+ select: []
+ },
+ insResult: {
select: [{
- value: 0,
- type: 'success',
- label: '姝ｅ父'
- }, {
value: 1,
- type: 'warning',
- label: '鎶ュ簾'
- }, {
- value: 2,
- type: 'danger',
- label: '淇濅慨'
+ label: '鍚堟牸',
+ type: 'success'
+ },{
+ value: 0,
+ label: '涓嶅悎鏍�',
+ type: 'danger'
+ },{
+ value: 3,
+ label: '涓嶅垽瀹�',
+ type: ''
}]
}
},
selectField: {},
+ spanConfig:{
+ rows:[
+ {
+ name:'sampleCode',
+ index:0
+ },
+ {
+ name:'sample',
+ index:1
+ },
+ {
+ name:'model',
+ 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,
upLoad: false,
tabList: [{
- label: '妫�楠屽鐞�',
+ label: '寰呭鏍�',
+ value: 0
+ }, {
+ label: '寰呮楠�',
value: 1
},
{
- label: '寰呭鏍�',
- value: 0
+ label: '宸叉楠�',
+ value: 4
},
{
label: '閫�鍥�',
@@ -330,19 +911,214 @@
},
],
tabIndex: 0,
- active: 0
+ active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
+ currentId: null,
+ more:false,
+ insOrderRow:{},
+ checkIndexList:[],
+ checkDataList:[],
+ qrData:[],
+ multipleSelection:[],
+ sonLaboratoryList:[],
+ currentRole:'',
+ BZinfo:[],
+ BZDialogVisible:false,
+ downVisible:false,
+ downList:[],
+ formType:[],
+ currentInfo:{},
+ sampleList:[],
+ lookDialogVisible:false,
+ lookDialogVisible0:false,
+ sampleId:null,
+ orderId0:null,
+ currentItem:{},
}
},
+ watch:{
+ printDialogVisible(newVal){
+ if(!newVal){
+ this.qrData = []
+ this.checkIndexList = []
+ 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: {
- getAuthorizedPerson(){
- this.$axios.post(this.$api.deviceScope.selectDevicePrincipal).then(res => {
+ 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;
+ this.$axios.post(this.$api.insOrder.labelPrinting,{
+ ids:selection.map(m=>m.id).join(',')
+ }).then(res => {
+ let arr = res.data;
+ arr.forEach(a=>{
+ this.loadPint = false;
+ let arr1 = []
+ a.insProduct.forEach(b=>{
+ arr1.push(b.inspectionItemSubclass)
+ })
+ a.item = [...new Set(arr1)].join(',')
+ })
+ this.qrData = arr.map(m=>{
+ m.str = JSON.stringify({
+ sampleCode:m.sampleCode,
+ entrustCode:m.code
+ })
+ return m
+ })
+ // console.log(this.qrData)
+ })
+ },
+ //閫夋嫨瑕佹墦鍗扮殑浜岀淮鐮�
+ changePrintCode(){
+ let indexList = this.checkIndexList
+ let arr = []
+ indexList.forEach(i=>{
+ arr.push(this.qrData[i])
+ })
+ this.checkDataList = arr
+ },
+ //鍏ㄩ��
+ handleCheckAllChange(val) {
+ if(val){
+ for(var i=0;i<this.qrData.length;i++){
+ this.checkIndexList.push(i)
+ }
+ this.checkDataList = this.qrData
+ }else{
+ this.checkIndexList = []
+ this.checkDataList = []
+ }
+ this.isIndeterminate = false;
+ },
+ submitPrint(){
+ if(this.checkDataList.length < 1){
+ this.$message.warning("璇烽�夋嫨瑕佹墦鍗扮殑浜岀淮鐮�")
+ return
+ }
+ PrintJS({
+ targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+ printable: 'printMOrder',//椤甸潰
+ type: "html",//鏂囨。绫诲瀷
+ documentTitle: "浜岀淮鐮�",
+ style:
+ `@page {
+ margin: 0;
+ size: landscape;
+ }
+ body{
+ zoom:100%;
+ padding:30px 0;
+ margin:0;
+ }`,
+ });
+ },
+ async print(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ let selection = this.multipleSelection
+ let isAdd = await this.searchPrint(selection)
+ if(!isAdd){
+ this.getLabelPrinting(selection)
+ this.printDialogVisible = true
+ }
+ },
+ getAuthorizedPerson() {
+ this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
data.push({
label: a.name,
value: a.id
@@ -350,12 +1126,20 @@
})
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() {
+ let state = this.componentData.entity.state
this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.componentData.entity.state = state
+ this.refreshTable()
this.upIndex++
},
// 鏉冮檺鍒嗛厤
@@ -364,23 +1148,38 @@
let up = false
let del = false
let add = false
+ let revoke = false
+ let check = false
+ let checkUpdate = false
for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'upDeviceParameter') {
+ if (power[i].menuMethod == 'upInsOrder') {
up = true
}
- if (power[i].menuMethod == 'delDeviceParameter') {
- del = true
- }
- if (power[i].menuMethod == 'addDeviceParameter') {
+ if (power[i].menuMethod == 'addInsOrder') {
add = true
}
- }
- if (!del) {
- this.componentData.do.splice(1, 1)
+ if (power[i].menuMethod == 'updateStatus') {
+ revoke = true
+ }
+ if (power[i].menuMethod == 'upInsOrderOfState2') {
+ check = true
+ }
+ if (power[i].menuMethod == 'checkUpdate') {
+ checkUpdate = true
+ }
}
if (!up) {
- this.componentData.do.splice(0, 1)
+ this.componentData.do.splice(5, 1)
}
+ if (!checkUpdate) {
+ 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
},
handleClose() {
@@ -399,38 +1198,189 @@
},
// 璇︽儏
selectAllByOne(row) {
- //鎵撳紑寮规
- this.dialogVisible = true;
- //row = 鐐瑰嚮瀵瑰簲琛屽��
- //澶嶅埗缁檉ormData
- this.formData = this.HaveJson(row);
+ this.active = 2;
+ // console.log(row);
+ // //鎵撳紑寮规
+ // this.dialogVisible = true;
+ // //row = 鐐瑰嚮瀵瑰簲琛屽��
+ // //澶嶅埗缁檉ormData
+ // this.formData = this.HaveJson(row);
+ this.currentId = row.id
+ this.examine = 1
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
- 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'
+ const link = document.createElement('a');
+ link.href = this.javaApi + url;
+ link.target = '_blank';
+ document.body.appendChild(link);
+ link.click();
+ }
+ },
// 瀹℃牳
handleVerify(row) {
- this.verifyDialogVisible = true;
+ // this.verifyDialogVisible = true;
+ this.active = 3;
+ this.currentId = row.id
+ this.examine = 1
},
// 鎾ら攢
handlEquash(row) {
- this.quashDialogVisible = true;
+ 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;
- },
- submitForm2(){
- this.upLoad = true;
- this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData2, {
- headers: {
- 'Content-Type': 'application/json'
+ this.$axios.post(this.$api.insOrder.selectOrderManDay, {
+ id: row.id
+ }).then(res => {
+ this.distributeData.orderId = row.id
+ this.distributeData.sampleId = row.sampleId
+ 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.sonLaboratory==null||this.distributeData.sonLaboratory==''){
+ this.$message.error('璇曢獙瀹ゆ湭濉啓')
+ return
+ }
+ this.upLoad = true;
+ this.$axios.post(this.$api.insOrder.upInsOrder, {
+ orderId: this.distributeData.orderId,
+ sampleId: this.distributeData.sampleId,
+ appointed: this.distributeData.appointed,
+ userId: this.distributeData.userId,
+ sonLaboratory:this.distributeData.sonLaboratory,
}).then(res => {
if (res.code === 201) {
this.upLoad = false
@@ -438,50 +1388,108 @@
}
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
- this.refreshTable()
- this.dialogVisible = false
+ this.issuedDialogVisible = false
+ this.refreshTable('page')
}).catch(e => {
this.$message.error('淇敼澶辫触')
- this.dialogVisible = false
this.upLoad = false
})
},
submitForm() {
this.upLoad = true;
+ if (this.tabIndex==1){
+ this.axios.put(this.$api.insOrder.updateInspected+"?id="+this.insOrderRow.id).then(res=>{
+ if (res.code===200){
+ this.upLoad=false
+ this.quashDialogVisible=false
+ this.refreshTable('page')
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }else{
+ this.axios.put(this.$api.insOrder.updateStatus+"?id="+this.insOrderRow.id).then(res=>{
+ if (res.code===200){
+ this.upLoad = false
+ this.quashDialogVisible = false
+ this.refreshTable('page')
+ this.$message.success("鏇存柊鎴愬姛")
+ }
+ })
+ }
let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
delete this.formData.createTime
delete this.formData.updateTime
delete this.formData.createUser
delete this.formData.updateUser
this.formData.authorizedPerson = authorizedPerson
- this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
- this.$message.success('淇敼鎴愬姛')
- this.upLoad = false
- this.refreshTable()
- this.dialogVisible = false
- }).catch(e => {
- this.$message.error('淇敼澶辫触')
- this.dialogVisible = false
- this.upLoad = false
- })
},
// 涓嬪崟
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 = []
+ res.data.forEach(a => {
+ data.push({
+ label: a.name,
+ value: a.id
+ })
+ })
+ this.componentData.tagField.createUser.select = data
+ })
+ },
+ getInsStateDicts() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "妫�楠屼换鍔＄姸鎬�"
+ }).then(res => {
+ let data = res.data
+ this.insStateList = data
+ data.forEach(ele => {
+ //0:寰呮楠� 1:妫�楠屼腑 2:宸叉楠� 3:寰呭鏍� 4:澶嶆牳鏈�氳繃 5:澶嶆牳閫氳繃
+ if (['2', '5'].includes(ele.value)) {
+ ele.type = 'success'
+ } else if (['1', '3'].includes(ele.value)) {
+ ele.type = 'warning'
+ } else if (['0', '4'].includes(ele.value)) {
+ ele.type = 'danger'
+ }
+ })
+ this.componentDataDataLook.tagField.insState.select = data
+ this.componentDataDelete.tagField.insState.select = data
+ })
+ },
+ selectEnumByCategoryForOrderType() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "妫�楠岀被鍒�"
+ }).then(res => {
+ this.componentData.tagField.orderType.select = res.data
+ })
+ },
+ getStyle(){
+ return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
+ },
+ changeUser(){
+ if(this.sonLaboratoryList.length>0){
+ this.distributeData.sonLaboratory = this.sonLaboratoryList[0].value
+ }
+ }
}
}
</script>
--
Gitblit v1.9.3