From 45792b3776cda2e1ada31755ffc226a663f90b48 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 19 三月 2025 15:32:23 +0800
Subject: [PATCH] 锁屏功能
---
src/views/business/inspectionOrder/index.vue | 1978 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 1,070 insertions(+), 908 deletions(-)
diff --git a/src/views/business/inspectionOrder/index.vue b/src/views/business/inspectionOrder/index.vue
index 56b36ab..206fe23 100644
--- a/src/views/business/inspectionOrder/index.vue
+++ b/src/views/business/inspectionOrder/index.vue
@@ -4,11 +4,23 @@
<el-row class="title">
<el-col :span="12" style="text-align: left">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right">
- <el-button size="medium" type="primary" @click="dialogVisible1 = true"
- :loading="exportCheckedLoading">瀵煎嚭妫�楠岀粨鏋�</el-button>
- <el-button size="medium" type="primary" @click="print">鏍囩鎵撳嵃</el-button>
- <el-button size="medium" type="primary" @click="playOrder(1)"
- v-hasPermi="['business:order:add']">涓嬪崟</el-button>
+ <el-button
+ size="medium"
+ type="primary"
+ @click="dialogVisible1 = true"
+ :loading="exportCheckedLoading"
+ >瀵煎嚭妫�楠岀粨鏋�</el-button
+ >
+ <el-button size="medium" type="primary" @click="print"
+ >鏍囩鎵撳嵃</el-button
+ >
+ <el-button
+ size="medium"
+ type="primary"
+ @click="playOrder(1)"
+ v-hasPermi="['business:order:add']"
+ >涓嬪崟</el-button
+ >
</el-col>
</el-row>
</div>
@@ -19,8 +31,13 @@
<div class="search_thing" style="width: 20%">
<div class="search_label">濮旀墭缂栧彿锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.entrustCode"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.entrustCode"
+ @keyup.enter.native="refreshTable()"
+ ></el-input>
</div>
</div>
<div class="search_thing" style="width: 20%">
@@ -28,68 +45,119 @@
澶栭儴濮旀墭缂栧彿锛�
</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.outEntrustCode"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.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="queryParams.sampleName"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.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="queryParams.sampleModel"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.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="queryParams.sampleCode"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.sampleCode"
+ @keyup.enter.native="refreshTable()"
+ ></el-input>
</div>
</div>
<div class="search_thing" style="width: 40%" v-if="more">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
<div class="search_input">
- <el-date-picker style="width: 100%" v-model="queryParams.startAndEndTime" type="daterange" size="small"
- range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" value-format="yyyy-MM-dd"
- clearable placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ style="width: 100%"
+ v-model="queryParams.startAndEndTime"
+ type="daterange"
+ size="small"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ 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="queryParams.name"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.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="queryParams.engineering"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.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="queryParams.production"
- @keyup.enter.native="refreshTable()"></el-input>
+ <el-input
+ size="small"
+ placeholder="璇疯緭鍏�"
+ clearable
+ v-model="queryParams.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
+ 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>
+ <el-button size="small" type="primary" @click="refreshTable()"
+ >鏌� 璇�</el-button
+ >
</div>
</el-col>
</el-row>
@@ -99,59 +167,114 @@
<div v-show="active == 0">
<div class="table">
<ul class="tab">
- <li v-for="(m, i) in tabList" :key="i + 'afgh'" :class="{ active: i == tabIndex }" @click="handleTab(m, i)">
+ <li
+ v-for="(m, i) in tabList"
+ :key="i + 'afgh'"
+ :class="{ active: i == tabIndex }"
+ @click="handleTab(m, i)"
+ >
{{ m.label }}
</li>
</ul>
- <lims-table :tableData="tableData" :height="tableHeight + ''" @pagination="pagination" :column="column"
- :page="page" :tableLoading="tableLoading"></lims-table>
+ <lims-table
+ highlightCurrentRow
+ isSelection
+ :tableData="tableData"
+ :height="tableHeight + ''"
+ @pagination="pagination"
+ :handleSelectionChange="selectionChange"
+ :column="column"
+ :page="page"
+ :tableLoading="tableLoading"
+ ></lims-table>
</div>
<!-- 瀹℃牳 -->
- <el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
+ <el-dialog
+ title="涓嬪崟瀹℃牳"
+ :visible.sync="verifyDialogVisible"
+ width="30%"
+ :before-close="handleClose"
+ >
<p style="font-size: 16px; color: #333333" v-if="!isPass">
- 濮旀墭缂栧彿<span style="color: #34bd66">ZTMS2023071001</span>鐨勪俊鎭槸鍚﹂�氳繃
+ 濮旀墭缂栧彿<span style="color: #34bd66">ZTMS2023071001</span
+ >鐨勪俊鎭槸鍚﹂�氳繃
</p>
- <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
+ <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>
+ <el-input
+ v-model="formData.specificationModel"
+ size="small"
+ style="width: 60%"
+ ></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-row v-if="!isPass">
<el-button @click="handleClose">閫� 鍥�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad">閫� 杩�</el-button>
+ <el-button type="primary" @click="submitForm" :loading="upLoad"
+ >閫� 杩�</el-button
+ >
</el-row>
<el-row v-else>
<el-button @click="handleClose">杩� 鍥�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitForm" :loading="upLoad"
+ >纭� 瀹�</el-button
+ >
</el-row>
</span>
</el-dialog>
<!-- 鎾ら攢 -->
- <el-dialog title="涓嬪崟鎾ら攢" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose">
+ <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">{{
- this.insOrderRow.entrustCode
- }}</span>鐨勪俊鎭槸鍚︽挙閿�
+ this.insOrderRow.outEntrustCode
+ }}</span
+ >鐨勪俊鎭槸鍚︽挙閿�
</p>
- <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
+ <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>
+ <el-input
+ v-model="formData.specificationModel"
+ size="small"
+ style="width: 60%"
+ ></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-row v-if="!isQuash">
- <el-button @click="handleClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
- </el-row>
- <el-row v-else>
- <el-button @click="handleClose">杩� 鍥�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
+ <el-row>
+ <el-button @click="handleClose">{{
+ isQuash ? "杩� 鍥�" : "鍙� 娑�"
+ }}</el-button>
+ <el-button type="primary" @click="submitForm" :loading="upLoad"
+ >纭� 瀹�</el-button
+ >
</el-row>
</span>
</el-dialog>
<!-- 涓嬪彂 -->
- <el-dialog title="妫�楠屽垎閰�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
+ <el-dialog
+ title="妫�楠屽垎閰�"
+ :visible.sync="issuedDialogVisible"
+ width="400px"
+ :before-close="handleClose"
+ >
<div class="body" style="max-height: 60vh">
<el-row>
<el-col class="search_thing" style="width: 95%">
@@ -159,34 +282,73 @@
<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
+ 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">
- <span class="required-span" v-show="distributeData.type == 2">* </span>鎸囨淳浜哄憳锛�
+ <span class="required-span" v-show="distributeData.type == 2"
+ >* </span
+ >鎸囨淳浜哄憳锛�
</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%"
- clearable filterable @change="changeUser">
- <el-option-group v-for="(item, index) in Object.keys(personList)" :key="index" :label="item">
- <el-option v-for="op in personList[item]" :key="op.id" :label="op.name" :value="op.id">
+ <el-select
+ v-model="distributeData.userId"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="width: 100%"
+ clearable
+ filterable
+ @change="changeUser"
+ >
+ <el-option-group
+ v-for="(item, index) in Object.keys(personList)"
+ :key="index"
+ :label="item"
+ >
+ <el-option
+ v-for="op in personList[item]"
+ :key="op.id"
+ :label="op.name"
+ :value="op.id"
+ >
</el-option>
</el-option-group>
</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%"
+ v-if="distributeData.userId"
+ >
<div class="search_label">
<span class="required-span">* </span>璇曢獙瀹わ細
</div>
<div class="search_input">
- <el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨11" 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-select
+ v-model="distributeData.sonLaboratory"
+ placeholder="璇烽�夋嫨11"
+ 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>
@@ -196,48 +358,85 @@
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="handleClose2">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitForm2" :loading="upLoad"
+ >纭� 瀹�</el-button
+ >
</el-row>
</span>
</el-dialog>
- <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="100%" fullscreen>
- <div style="height: 80vh; overflow-y: auto" v-if="dataDialogVisible">
- <ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'"
- :url="$api.insOrder.selectSampleAndProductByOrderId" :componentData="componentDataDataLook" />
- </div>
+ <el-dialog
+ title="鏁版嵁鏌ョ湅"
+ :visible.sync="dataDialogVisible"
+ width="100%"
+ fullscreen
+ >
+ <lims-table
+ highlightCurrentRow
+ :height="'80vh'"
+ :tableData="dataLooktableData"
+ :column="dataLookColumn"
+ :tableLoading="dataLookTableLoading"
+ ></lims-table>
</el-dialog>
- <el-dialog top="5vh" :title="deleteTilte" :visible.sync="deleteDialogVisible" :before-close="handleCloseDelete"
- width="80%">
+ <el-dialog
+ top="5vh"
+ :title="deleteTilte"
+ :visible.sync="deleteDialogVisible"
+ :before-close="handleCloseDelete"
+ width="80%"
+ >
<div class="table-container" v-if="deleteDialogVisible">
- <!-- <ValueTable
- ref="ValueTableDataDelete"
- :url="
- $api.insOrder.selectNoProducts +
- '?orderId=' +
- orderId +
- '&ids=' +
- this.revocationInsProductIds
- "
- :componentData="componentDataDelete"
- :isColumnWidth="true"
- /> -->
- <el-table height="500px" ref="revokeTable" @select="handleSelectionChange" @select-all="handleSelectionAll"
- :data="treeTableData" style="width: 100%" row-key="id" border lazy :load="load"
- :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column v-if="deleteTilte == '鎾ら攢'" type="selection" width="55"></el-table-column>
- <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" show-overflow-tooltip>
+ <el-table
+ height="500px"
+ ref="revokeTable"
+ @select="handleSelectionChange"
+ @select-all="handleSelectionAll"
+ :data="treeTableData"
+ style="width: 100%"
+ row-key="id"
+ border
+ lazy
+ :load="load"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+ >
+ <el-table-column
+ v-if="deleteTilte == '鎾ら攢'"
+ type="selection"
+ width="55"
+ ></el-table-column>
+ <el-table-column
+ prop="sampleCode"
+ label="鏍峰搧缂栧彿"
+ show-overflow-tooltip
+ >
</el-table-column>
- <el-table-column prop="inspectionItem" label="妫�楠岄」" show-overflow-tooltip>
+ <el-table-column
+ prop="inspectionItem"
+ label="妫�楠岄」"
+ show-overflow-tooltip
+ >
</el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="妫�楠屽瓙椤�" show-overflow-tooltip>
+ <el-table-column
+ prop="inspectionItemSubclass"
+ label="妫�楠屽瓙椤�"
+ show-overflow-tooltip
+ >
</el-table-column>
- <el-table-column prop="sampleType" label="鏍峰搧鍒嗙被" show-overflow-tooltip>
+ <el-table-column
+ prop="sampleType"
+ label="鏍峰搧鍒嗙被"
+ show-overflow-tooltip
+ >
</el-table-column>
<el-table-column prop="sample" label="鏍峰搧" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="model" label="鍨嬪彿" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="sonLaboratory" label="璇曢獙瀹�" show-overflow-tooltip>
+ <el-table-column
+ prop="sonLaboratory"
+ label="璇曢獙瀹�"
+ show-overflow-tooltip
+ >
</el-table-column>
<el-table-column prop="tell" label="瑕佹眰鍊�" show-overflow-tooltip>
</el-table-column>
@@ -248,46 +447,117 @@
<el-button @click="handleNo">{{
deleteTilte == "鎾ら攢" ? "鍙� 娑�" : "涓嶉�氳繃"
}}</el-button>
- <el-button type="primary" @click="submitDelete" :loading="printLoading">{{ deleteTilte == "鎾ら攢" ? "纭� 瀹�" :
- "閫� 杩�" }}</el-button>
+ <el-button
+ type="primary"
+ @click="submitDelete"
+ :loading="printLoading"
+ >{{ deleteTilte == "鎾ら攢" ? "纭� 瀹�" : "閫� 杩�" }}</el-button
+ >
</el-row>
</span>
</el-dialog>
<!-- 鏁版嵁鏌ョ湅璇︽儏 -->
- <el-dialog title="鏌ョ湅璇︽儏" :visible.sync="dialogVisible" width="70%" :before-close="handleClose3">
- <el-table v-if="type == '鍗曟牴鍨傜洿鐕冪儳' || type == '鏉惧绠�'" :data="viewDetailsList" height="400px" border
- style="width: 100%">
- <el-table-column type="index" label="搴忓彿" width="80px"></el-table-column>
- <el-table-column prop="entrustCode" label="濮旀墭鍗曞彿"></el-table-column>
- <el-table-column prop="sampleCode" label="鏍峰搧缂栧彿"></el-table-column>
+ <el-dialog
+ title="鏌ョ湅璇︽儏"
+ :visible.sync="dialogVisible"
+ width="70%"
+ :before-close="handleClose3"
+ >
+ <el-table
+ v-if="type == '鍗曟牴鍨傜洿鐕冪儳' || type == '鏉惧绠�'"
+ :data="viewDetailsList"
+ height="400px"
+ border
+ style="width: 100%"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="80px"
+ ></el-table-column>
+ <el-table-column
+ prop="entrustCode"
+ label="濮旀墭鍗曞彿"
+ ></el-table-column>
+ <el-table-column
+ prop="sampleCode"
+ label="鏍峰搧缂栧彿"
+ ></el-table-column>
<el-table-column prop="color" label="濂楃"></el-table-column>
<!-- <el-table-column prop="inspectionItem" label="妫�楠岄」"></el-table-column> -->
<el-table-column prop="insValue" label="妫�楠岀粨鏋�"></el-table-column>
</el-table>
- <el-table v-if="type == '鎶楁媺寮哄害'" :data="viewDetailsList" height="400px" border style="width: 100%">
- <el-table-column type="index" label="搴忓彿" width="80px"></el-table-column>
- <el-table-column prop="inspectionItem" label="妫�楠岄」"></el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="妫�楠屽瓙椤�"></el-table-column>
+ <el-table
+ v-if="type == '鎶楁媺寮哄害'"
+ :data="viewDetailsList"
+ height="400px"
+ border
+ style="width: 100%"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="80px"
+ ></el-table-column>
+ <el-table-column
+ prop="inspectionItem"
+ label="妫�楠岄」"
+ ></el-table-column>
+ <el-table-column
+ prop="inspectionItemSubclass"
+ label="妫�楠屽瓙椤�"
+ ></el-table-column>
<el-table-column prop="width" label="瀹藉害"></el-table-column>
<el-table-column prop="thickness" label="鍘氬害"></el-table-column>
<el-table-column prop="testValue" label="妫�楠屽��"></el-table-column>
</el-table>
- <el-table v-if="type == '鏂浼搁暱鐜�'" :data="viewDetailsList" height="400px" border style="width: 100%">
- <el-table-column type="index" label="搴忓彿" width="80px"></el-table-column>
- <el-table-column prop="inspectionItem" label="妫�楠岄」"></el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="妫�楠屽瓙椤�"></el-table-column>
- <el-table-column v-for="(v, i) in tableHeader" :key="i" :prop="`testValue${i}`"
- :label="`妫�楠屽��${i + 1}`"></el-table-column>
+ <el-table
+ v-if="type == '鏂浼搁暱鐜�'"
+ :data="viewDetailsList"
+ height="400px"
+ border
+ style="width: 100%"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="80px"
+ ></el-table-column>
+ <el-table-column
+ prop="inspectionItem"
+ label="妫�楠岄」"
+ ></el-table-column>
+ <el-table-column
+ prop="inspectionItemSubclass"
+ label="妫�楠屽瓙椤�"
+ ></el-table-column>
+ <el-table-column
+ v-for="(v, i) in tableHeader"
+ :key="i"
+ :prop="`testValue${i}`"
+ :label="`妫�楠屽��${i + 1}`"
+ ></el-table-column>
</el-table>
</el-dialog>
-
<!-- 瀵煎嚭宸叉鏁版嵁 -->
- <el-dialog title="閫夋嫨鏃ユ湡" :visible.sync="dialogVisible1" width="30%" :before-close="handleClose4">
+ <el-dialog
+ title="閫夋嫨鏃ユ湡"
+ :visible.sync="dialogVisible1"
+ width="30%"
+ :before-close="handleClose4"
+ >
<span>涓嬪崟鏃ユ湡: </span>
- <el-date-picker v-model="exportCheckedDate" type="daterange" size="small" value-format="yyyy-MM-dd"
- range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="exportCheckedDate"
+ type="daterange"
+ size="small"
+ value-format="yyyy-MM-dd"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ >
</el-date-picker>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose4">鍙� 娑�</el-button>
@@ -295,18 +565,48 @@
</span>
</el-dialog>
</div>
- <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">
- <div style="width: 100%; height: 400px; overflow-y: auto" v-loading="loadPint">
+ <!-- <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"
+ >
+ <div
+ style="width: 100%; height: 400px; overflow-y: auto"
+ v-loading="loadPint"
+ >
<div class="dia_body">
- <el-checkbox style="margin: 10px 5px" :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 + '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>
+ <el-checkbox
+ style="margin: 10px 5px"
+ :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 + '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>
<el-row style="font-size: 14px; padding-left: 20px">
<el-col style="font-weight: bold">{{ item.pName }}</el-col>
@@ -314,48 +614,89 @@
<div style="display: flex">
<div>
<el-col :span="8" :offset="4">
- <vueQr :text="'https://zttx-lims.ztt.cn:8021/lims/qr/qrScan?code=' +
- item.id +
- '&type=sample'
- " :size="140" :margin="2"></vueQr>
+ <vueQr
+ :text="
+ 'https://zttx-lims.ztt.cn:8021/lims/qr/qrScan?code=' +
+ item.id +
+ '&type=sample'
+ "
+ :size="140"
+ :margin="2"
+ ></vueQr>
</el-col>
</div>
<div style="margin-left: 50px; width: 100%">
<el-row>
- <el-col style="
+ <el-col
+ style="
font-weight: bold;
text-align: left;
font-size: 14px;
- "><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ "
+ ><span>鏍峰搧缂栧彿: </span
+ >{{ item.sampleCode }}</el-col
+ >
</el-row>
<el-row style="margin-top: 1px; font-size: 14px">
- <el-col style="font-weight: bold; text-align: left"><span>濮旀墭鍗曞彿: </span>{{ item.code
- }}</el-col>
+ <el-col style="font-weight: bold; text-align: left"
+ ><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col
+ >
</el-row>
<el-row style="margin-top: 1px; font-size: 14px">
- <el-col style="font-weight: bold; text-align: left"><span>瑙勬牸鍨嬪彿: </span>{{ item.model
- }}</el-col>
+ <el-col style="font-weight: bold; text-align: left"
+ ><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col
+ >
</el-row>
<el-row style="margin-top: 1px; font-size: 14px">
- <el-col style="font-weight: bold; text-align: left"><span>鏍峰搧鍚嶇О: </span>{{ item.sample
- }}</el-col>
+ <el-col style="font-weight: bold; text-align: left"
+ ><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; text-align: left"><span>妫�娴嬮」鐩�: </span>{{ item.item
- }}</el-col>
+ <el-row
+ style="margin-top: 1px; font-size: 14px"
+ class="ellipsis-multiline"
+ >
+ <el-col style="font-weight: bold; text-align: left"
+ ><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col
+ >
</el-row>
<el-row style="margin-top: 2px; font-size: 14px">
- <el-col style="
+ <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>
+ "
+ ><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>
</div>
@@ -367,40 +708,61 @@
<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-button
+ type="primary"
+ @click="submitPrint"
+ :loading="printLoading"
+ >鎵� 鍗�</el-button
+ >
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="
+ <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="
+ <el-card
+ class="box-card"
+ v-for="(item, i) in checkDataList"
+ :key="i + 'uuuuu'"
+ style="
font-size: 0.2cm !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="'https://zttx-lims.ztt.cn:8021/lims/qr/qrScan?code=' +
- item.id +
- '&type=sample'
- " :size="60" :margin="2"></vueQr>
+ <vueQr
+ :text="
+ 'https://zttx-lims.ztt.cn:8021/lims/qr/qrScan?code=' +
+ item.id +
+ '&type=sample'
+ "
+ :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.2cm; width: 4cm" class="single-line-ellipsis"><span>鏍峰搧缂栧彿: </span>{{
- item.sampleCode }}</el-col>
+ <el-col
+ style="font-size: 0.2cm; width: 4cm"
+ class="single-line-ellipsis"
+ ><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col
+ >
</el-row>
<el-row style="font-size: 0.2cm">
<el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
@@ -409,19 +771,29 @@
<el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="font-size: 0.2cm">
- <el-col><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
+ <el-col
+ ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col
+ >
</el-row>
<el-row style="font-size: 0.2cm; width: 4cm">
- <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ <el-col class="ellipsis-multiline"
+ ><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col
+ >
</el-row>
<el-row style="margin-top: 0.01cm; font-size: 0.2cm">
- <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-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-col>
</el-row>
</div>
@@ -434,18 +806,34 @@
</template>
<script>
-import limsTable from "@/components/Table/lims-table.vue";
import {
selectInsOrderParameter,
- hasSendUrgentOrder,
- delCustomById,
- upCustom,
+ labelPrinting,
+ exportChecked,
+ selectSampleAndProductByOrderId,
+ selectSampleByOrderId,
+ selectProductsBySampleId,
+ revoke,
+ viewDetails,
+ downReport,
+ selectTemperatureByProductId,
+ selectTemperatureNumberByProductId,
+ revokeReviewTemperatureByProductId,
+ revokeReviewConsistentByProductId,
+ revokeReviewProduct,
+ revokeReviewSample,
+ updateStatus,
+ updateInspected,
+ revocationPassed,
+ revocationCancel,
} from "@/api/business/inspectionOrder";
+import { upPlanUser2 } from "@/api/business/inspectionTask";
import { getDicts } from "@/api/system/dict/data";
import vueQr from "vue-qr";
import getLodop from "@/utils/lodop";
import Add from "./add.vue";
import { mapGetters } from "vuex";
+import limsTable from "@/components/Table/lims-table.vue";
export default {
components: {
limsTable,
@@ -499,6 +887,11 @@
prop: "sampleName",
minWidth: "160px",
width: "160px",
+ dataType: "link",
+ linkEvent: {
+ method: "showDetails",
+ vueComponent: this,
+ },
},
{
label: "鏍峰搧缂栧彿",
@@ -600,43 +993,280 @@
width: "120px",
},
{
+ label: "鎿嶄綔",
dataType: "action",
fixed: "right",
- label: "鎿嶄綔",
operation: [
{
name: "鏁版嵁鏌ョ湅",
type: "text",
- clickFun: (row) => { },
+ disabled: (row) => {
+ return row.state != 1 && row.state != 4;
+ },
+ clickFun: (row) => {
+ this.handleDataLook(row);
+ },
+ showHide: () => {
+ return true;
+ },
},
{
name: "鎶ュ憡涓嬭浇",
type: "text",
- clickFun: (row) => { },
+ clickFun: (row) => {
+ this.download(row);
+ },
+ disabled: (row, index) => {
+ return row.state != 4 || row.isRatify != 1;
+ },
},
{
name: "瀹℃牳",
type: "text",
- clickFun: (row) => { },
+ clickFun: (row) => {
+ this.handleVerify(row);
+ },
+ disabled: (row, index) => {
+ return row.state != 0;
+ },
},
{
name: "鎾ら攢",
type: "text",
- clickFun: (row) => { },
+ clickFun: (row) => {
+ this.handlEquash(row);
+ },
+ disabled: (row, index) => {
+ return row.state != 1 && row.state != 0;
+ },
},
{
name: "鎾ら攢瀹℃牳",
type: "text",
- clickFun: (row) => { },
+ clickFun: (row) => {
+ this.handlEquashCheck(row);
+ },
+ disabled: (row, index) => {
+ return (
+ (row.state != 1 && row.state != 0) ||
+ this.tabIndex != 1 ||
+ row.isRevocation != 1
+ );
+ },
},
{
name: "鍒嗛厤",
type: "text",
- clickFun: (row) => { },
+ clickFun: (row) => {},
+ disabled: (row, index) => {
+ return (
+ row.state != 1 ||
+ (row.entrustCode != null &&
+ Number(row.assign) > 0 &&
+ row.inspectId != null)
+ );
+ },
},
],
},
],
+ dataLookColumn: [
+ {
+ label: "濮旀墭缂栧彿",
+ prop: "entrustCode",
+ minWidth: "160px",
+ width: "160px",
+ },
+ {
+ label: "鏍峰搧缂栧彿",
+ prop: "sampleCode",
+ minWidth: "160px",
+ width: "160px",
+ },
+ {
+ label: "绠″鑹叉爣",
+ prop: "bushColor",
+ minWidth: "100px",
+ width: "100px",
+ },
+ {
+ label: "鍏夌氦甯︾紪鍙�",
+ prop: "code",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ label: "鍏夌氦鑹叉爣",
+ prop: "color",
+ minWidth: "100px",
+ width: "100px",
+ },
+ {
+ label: "妫�楠岄」",
+ prop: "inspectionItem",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ label: "妫�楠屽瓙椤�",
+ prop: "inspectionItemSubclass",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ label: "妫�楠岀粨鏋�",
+ prop: "lastValue",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ label: "缁撴灉鍒ゅ畾",
+ prop: "insResult",
+ minWidth: "100px",
+ width: "100px",
+ dataType: "tag",
+ formatData: (params) => {
+ let index = this.insResultList.findIndex(
+ (item) => item.value == params
+ );
+ if (index > -1) {
+ return this.insResultList[index].label;
+ } else {
+ return null;
+ }
+ },
+ formatType: (params) => {
+ let index = this.insResultList.findIndex(
+ (item) => item.value == params
+ );
+ if (index > -1) {
+ return this.insResultList[index].type;
+ } else {
+ return null;
+ }
+ },
+ },
+ {
+ label: "鍗曚綅",
+ prop: "unit",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ label: "璇曢獙瑕佹眰",
+ prop: "tell",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ label: "妫�楠屼汉",
+ prop: "checkName",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ label: "妫�楠屾棩鏈�",
+ prop: "checkTime",
+ minWidth: "140px",
+ width: "140px",
+ },
+ {
+ label: "鏍峰搧鍚嶇О",
+ prop: "sample",
+ minWidth: "160px",
+ width: "160px",
+ },
+ {
+ label: "鏍峰搧鍨嬪彿",
+ prop: "model",
+ minWidth: "160px",
+ width: "160px",
+ },
+ {
+ label: "璇曢獙瀹�",
+ prop: "sonLaboratory",
+ minWidth: "120px",
+ width: "120px",
+ },
+ {
+ dataType: "action",
+ label: "鎿嶄綔",
+ fixed: "right",
+ operation: [
+ {
+ name: "鏌ョ湅",
+ type: "text",
+ clickFun: (row) => {
+ this.viewDetails(row);
+ },
+ showHide: (row) => {
+ return (
+ row.inspectionItem == "鍗曟牴鍨傜洿鐕冪儳" ||
+ row.inspectionItem.includes("鏉惧绠�") ||
+ row.inspectionItemSubclass.includes("鏉惧绠�") ||
+ (row.inspectionItem == "鎶楁媺寮哄害" &&
+ (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
+ row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�")) ||
+ (row.inspectionItem == "鏂浼搁暱鐜�" &&
+ (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
+ row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�"))
+ );
+ },
+ },
+ ],
+ },
+ ],
+ dataLookTableLoading: false,
+ dataLooktableData: [],
+ qrData: [],
+ multipleSelection: [],
+ sonLaboratoryList: [],
+ urgencyDictList: [],
+ tableHeight: 0,
+ tabList: [
+ {
+ label: "寰呭鏍�",
+ value: 0,
+ },
+ {
+ label: "寰呮楠�",
+ value: 1,
+ },
+ {
+ label: "宸叉楠�",
+ value: 4,
+ },
+ {
+ label: "閫�鍥�",
+ value: 2,
+ },
+ {
+ label: "鎾ら攢",
+ value: 3,
+ },
+ ],
+ insResultList: [
+ {
+ value: 1,
+ label: "鍚堟牸",
+ type: "success",
+ },
+ {
+ value: 0,
+ label: "涓嶅悎鏍�",
+ type: "danger",
+ },
+ {
+ value: 3,
+ label: "涓嶅垽瀹�",
+ type: "",
+ },
+ ],
+ tabIndex: 0,
+ active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
+ currentId: null,
+ more: false,
+
//old
tableHeader: [],
type: "",
@@ -678,292 +1308,11 @@
// 浜哄憳鍒楄〃
personList: [],
currentTableData: [],
- componentData: {
- entity: {
- entrustCode: null,
- sample: null,
- sampleName: null,
- sampleModel: null,
- sampleCode: null,
- outEntrustCode: null,
- state: 0,
- name: null,
- engineering: null,
- production: null,
- startAndEndTime: [],
- // orderBy: {
- // field: '',
- // order: ''
- // }
- },
- isIndex: true,
- showSelect: true,
- select: true,
- selectMethod: "selectMethod",
- do: [
- {
- id: "dataLook",
- font: "鏁版嵁鏌ョ湅",
- type: "text",
- method: "handleDataLook",
- disabFun: (row, index) => {
- return row.state != 1 && row.state != 4;
- },
- },
- {
- id: "download",
- font: "鎶ュ憡涓嬭浇",
- type: "text",
- method: "download",
- disabFun: (row, index) => {
- return row.state != 4 || row.isRatify != 1;
- },
- },
- {
- id: "verify",
- font: "瀹℃牳",
- type: "text",
- method: "handleVerify",
- disabFun: (row, index) => {
- return row.state != 0;
- },
- },
- {
- id: "quash",
- font: "鎾ら攢",
- type: "text",
- method: "handlEquash",
- disabFun: (row, index) => {
- return row.state != 1 && row.state != 0;
- },
- },
- {
- id: "quashCheck",
- font: "鎾ら攢瀹℃牳",
- type: "text",
- method: "handlEquashCheck",
- disabFun: (row, index) => {
- return (
- (row.state != 1 && row.state != 0) ||
- this.tabIndex != 1 ||
- row.isRevocation != 1
- );
- },
- },
- {
- font: "鍒嗛厤",
- type: "text",
- method: "handleIssued",
- disabFun: (row, index) => {
- return (
- row.state != 1 ||
- (row.entrustCode != null &&
- Number(row.assign) > 0 &&
- row.inspectId != null)
- );
- },
- },
- ],
- linkEvent: {
- sampleName: {
- method: "selectAllByOne",
- },
- },
- tagField: {
- type: {
- select: [],
- },
- 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: [],
- requiredUp: [],
- needSort: ["createTime", "sendTime", "type", "appointed"],
- },
orderId: "",
revocationInsProductIds: "",
- componentDataDataLook: {
- isPage: false,
- entity: {
- id: 0,
- orderBy: {
- field: "sampleCode",
- order: "asc",
- },
- },
- isIndex: false,
- showSelect: false,
- select: false,
- do: [
- {
- id: "",
- font: "鏌ョ湅",
- type: "text",
- method: "viewDetails",
- showFun: (row, index) => {
- return (
- row.inspectionItem == "鍗曟牴鍨傜洿鐕冪儳" ||
- row.inspectionItem.includes("鏉惧绠�") ||
- row.inspectionItemSubclass.includes("鏉惧绠�") ||
- (row.inspectionItem == "鎶楁媺寮哄害" &&
- (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
- row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�")) ||
- (row.inspectionItem == "鏂浼搁暱鐜�" &&
- (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
- row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�"))
- );
- },
- },
- ],
- tagField: {
- insState: {
- select: [],
- },
- insResult: {
- select: [
- {
- value: 1,
- label: "鍚堟牸",
- type: "success",
- },
- {
- value: 0,
- label: "涓嶅悎鏍�",
- type: "danger",
- },
- {
- value: 3,
- label: "涓嶅垽瀹�",
- type: "",
- },
- ],
- },
- },
- selectField: {},
- spanConfig: {
- rows: [
- // {
- // name: "entrustCode",
- // index: 0,
- // },
- // {
- // name: "sampleCode",
- // index: 1,
- // },
- ],
- },
- 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,
upLoad: false,
- tabList: [
- {
- label: "寰呭鏍�",
- value: 0,
- },
- {
- label: "寰呮楠�",
- value: 1,
- },
- {
- label: "宸叉楠�",
- value: 4,
- },
- {
- label: "閫�鍥�",
- value: 2,
- },
- {
- label: "鎾ら攢",
- value: 3,
- },
- ],
- tabIndex: 0,
- active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
- currentId: null,
- more: false,
+
insOrderRow: {},
checkIndexList: [],
checkDataList: [
@@ -971,12 +1320,6 @@
sampleCode: "",
},
],
- qrData: [],
- multipleSelection: [],
- sonLaboratoryList: [],
- queryCount: 0,
- urgencyDictList: [],
- tableHeight: 0,
};
},
created() {
@@ -994,8 +1337,17 @@
more() {
this.getTableHeight();
},
+ printDialogVisible(newVal) {
+ if (!newVal) {
+ this.checkIndexList = [];
+ }
+ },
},
methods: {
+ selectionChange(val) {
+ console.log(val);
+ this.multipleSelection = val;
+ },
//鑾峰彇琛ㄦ牸楂樺害
getTableHeight() {
const otherHeight = this.more ? 430 : 380; // 鍏朵綑楂樺害
@@ -1045,16 +1397,9 @@
startTime: this.exportCheckedDate[0],
endTime: this.exportCheckedDate[1],
};
- console.log("data", data);
this.exportCheckedLoading = true;
this.dialogVisible1 = false;
- this.$axios
- .post(this.$api.insOrder.exportChecked, data, {
- headers: {
- "Content-Type": "application/json",
- },
- responseType: "blob",
- })
+ exportChecked(data)
.then((res) => {
this.$message.success("瀵煎嚭鎴愬姛");
this.exportCheckedDate = [];
@@ -1066,6 +1411,9 @@
link.download = "妫�楠岀粨鏋�.xlsx";
document.body.appendChild(link);
link.click();
+ })
+ .catch((error) => {
+ console.error(error);
});
},
// 鏌ョ湅璇︽儏
@@ -1085,46 +1433,48 @@
insSampleId: row.insSampleId,
entrustCode: row.entrustCode,
sampleCode: row.sampleCode,
+ inspectionItemSubclass: row.inspectionItemSubclass,
};
- this.$axios
- .post(this.$api.insOrder.viewDetails, data, {
- headers: {
- "Content-Type": "application/json",
- },
- })
+ viewDetails(data)
.then((res) => {
- this.viewDetailsList = res.data;
- if (res.data[0].tableHeader) {
- this.tableHeader = res.data[0].tableHeader;
- } else {
- this.tableHeader = [
- {
- testValue0: "",
- },
- ];
+ if (res.code === 200) {
+ this.viewDetailsList = res.data;
+ if (res.data[0].tableHeader) {
+ this.tableHeader = res.data[0].tableHeader;
+ } else {
+ this.tableHeader = [
+ {
+ testValue0: "",
+ },
+ ];
+ }
}
+ })
+ .catch((error) => {
+ console.error(error);
});
- },
- selectMethod(val) {
- this.multipleSelection = val;
},
getLabelPrinting(selection) {
this.loadPint = true;
- this.$axios
- .post(this.$api.insOrder.labelPrinting, {
- ids: selection.map((m) => m.id).join(","),
- })
+ 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.inspectionItem);
+ if (res.code === 200) {
+ let arr = res.data;
+ arr.forEach((a) => {
+ this.loadPint = false;
+ let arr1 = [];
+ a.insProduct.forEach((b) => {
+ arr1.push(b.inspectionItem);
+ });
+ a.item = [...new Set(arr1)].join(",");
});
- a.item = [...new Set(arr1)].join(",");
- });
- this.qrData = arr;
+ this.qrData = arr;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
},
//寮�濮嬫爣绛炬墦鍗�
@@ -1227,31 +1577,6 @@
this.beginPrint(this.qrData);
});
this.printDialogVisible = false;
-
- // PrintJS({
- // printable: "printMOrder", //椤甸潰
- // type: "html", //鏂囨。绫诲瀷
- // maxWidth: 360,
- // 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.15cm",
- // });
},
print() {
if (this.multipleSelection.length == 0) {
@@ -1262,72 +1587,22 @@
this.getLabelPrinting(selection);
this.printDialogVisible = true;
},
- // 閫夋嫨妫�楠屽垎閰嶄汉鍛�
- getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getLaboratoryPersonList).then((res) => {
- // let data = [];
- // res.data.forEach((a) => {
- // data.push({
- // label: a.name,
- // value: a.id,
- // });
- // });
- this.personList = res.data;
- });
- },
refreshTable() {
this.getList();
},
- getTableData(newData) {
- if (newData && newData.length == 1) {
- const insState = newData[0].state;
- this.tabList.forEach((ele, index) => {
- if (ele.value == insState && this.queryCount == 0) {
- this.handleTab(ele, index);
- this.queryCount = 1;
- }
- });
- }
- },
refresh() {
- this.componentData.entity = this.HaveJson(this.entityCopy);
- this.upIndex++;
+ this.queryParams = {
+ entrustCode: "",
+ outEntrustCode: "",
+ sampleName: "",
+ sampleModel: "",
+ sampleCode: "",
+ startAndEndTime: [],
+ name: "",
+ engineering: "",
+ production: "",
+ };
this.refreshTable();
- },
- // 鏉冮檺鍒嗛厤
- getPower(radio) {
- let power = JSON.parse(sessionStorage.getItem("power"));
- let up = false;
- let del = 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;
- }
- if (power[i].menuMethod == "updateStatus") {
- revoke = true;
- }
- if (power[i].menuMethod == "upInsOrderOfState") {
- 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) {
- this.componentData.do.splice(3, 1);
- }
- if (!check) {
- this.componentData.do.splice(2, 1);
- }
},
handleClose() {
this.verifyDialogVisible = false;
@@ -1350,52 +1625,34 @@
this.exportCheckedDate = [];
this.dialogVisible1 = false;
},
- // 璇︽儏
- selectAllByOne(row) {
- this.active = 2;
- // console.log(row);
- // //鎵撳紑寮规
- // this.dialogVisible = true;
- // //row = 鐐瑰嚮瀵瑰簲琛屽��
- // //澶嶅埗缁檉ormData
- // this.formData = this.HaveJson(row);
- this.currentId = row.id;
- this.examine = 1;
+ // 鏌ョ湅璇︽儏
+ showDetails(row) {
+ this.$router.push({
+ name: "showDetails",
+ query: {
+ active: 2,
+ currentId: row.id,
+ examine: 1,
+ isPlan: false,
+ },
+ });
},
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
- this.componentDataDataLook.entity.id = row.id;
+ selectSampleAndProductByOrderId({ id: row.id })
+ .then((res) => {
+ if (res.code === 200) {
+ this.dataLooktableData = res.data;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ });
this.dataDialogVisible = true;
},
// 涓嬭浇鎶ュ憡
download(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();
- // }
-
- // if(row.tempUrlPdf) {
- // const link = document.createElement('a');
- // link.href = this.javaApi + row.tempUrlPdf;
- // link.target = '_blank';
- // document.body.appendChild(link);
- // link.click();
- // }
- this.$axios
- .get(
- this.$api.insReport.downReport + "?id=" + row.reportId + "&type=1",
- {
- headers: {
- "Content-Type": "application/json",
- },
- responseType: "blob",
- }
- )
+ downReport({ id: row.reportId })
.then((res) => {
let fileName = row.tempUrlPdf;
if (fileName.includes("_")) {
@@ -1408,14 +1665,21 @@
link.download = fileName;
document.body.appendChild(link);
link.click();
+ })
+ .catch((error) => {
+ console.error(error);
});
},
// 瀹℃牳
handleVerify(row) {
- // this.verifyDialogVisible = true;
- this.active = 3;
- this.currentId = row.id;
- this.examine = 1;
+ this.$router.push({
+ name: "showDetails",
+ query: {
+ active: 3,
+ currentId: row.id,
+ examine: 1,
+ },
+ });
},
// 鍏ㄩ��
handleSelectionAll(val) {
@@ -1632,108 +1896,108 @@
if (this.deleteTilte == "鎾ら攢") {
// 鏄惁鏄俯搴﹀惊鐜�
if (tree.temperature) {
- this.$axios
- .get(
- this.$api.insOrder.selectTemperatureByProductId +
- "?productId=" +
- tree.id
- )
+ selectTemperatureByProductId({ productId: tree.id })
.then((res) => {
- this.loadRecursion(this.treeTableData, tree.id, res.data);
- resolve(res.data);
- this.recursionTreeTableData(this.revokeData, this.treeTableData);
- treeNode.loading = false;
+ if (res.code === 200) {
+ this.loadRecursion(this.treeTableData, tree.id, res.data);
+ resolve(res.data);
+ this.recursionTreeTableData(
+ this.revokeData,
+ this.treeTableData
+ );
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
// 鏄惁鏄楠屾鏁�
else if (tree.temperatureNumber) {
- this.$axios
- .get(
- this.$api.insOrder.selectTemperatureNumberByProductId +
- "?parentId=" +
- tree.parentId +
- "&inspectionItem=" +
- tree.inspectionItemTwo
- )
+ selectTemperatureNumberByProductId({
+ parentId: tree.parentId,
+ inspectionItem: tree.inspectionItemTwo,
+ })
.then((res) => {
- this.loadRecursion(this.treeTableData, tree.id, res.data);
- resolve(res.data);
- this.recursionTreeTableData(this.revokeData, this.treeTableData);
- treeNode.loading = false;
+ if (res.code === 200) {
+ this.loadRecursion(this.treeTableData, tree.id, res.data);
+ resolve(res.data);
+ this.recursionTreeTableData(
+ this.revokeData,
+ this.treeTableData
+ );
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
} else {
- this.$axios
- .get(
- this.$api.insOrder.selectProductsBySampleId +
- "?sampleId=" +
- tree.id +
- "&orderId=" +
- this.orderId
- )
+ selectProductsBySampleId({
+ sampleId: tree.id,
+ orderId: this.orderId,
+ })
.then((res) => {
- this.treeTableData.forEach((m, index) => {
- if (m.sampleId == tree.id) {
- m.children = res.data;
- }
- });
- resolve(res.data);
- this.recursionTreeTableData(this.revokeData, this.treeTableData);
- // // 濡傛灉璇ユ牱鍝佸凡缁忚鍕鹃�� 閭ｄ箞鎵�寰楀埌鐨勬楠岄」涔熻杩涜鍕鹃��
- // let data = this.revokeData.map((item) => item.id);
- // if (data.includes(tree.id)) {
- // this.treeTableData.forEach((m, index) => {
- // if (m.children) {
- // m.children.forEach((n, i) => {
- // if (tree.id == n.sampleId) {
- // this.$refs.revokeTable.toggleRowSelection(n, true);
- // }
- // });
- // }
- // });
- // }
- treeNode.loading = false;
+ if (res.code === 200) {
+ this.treeTableData.forEach((m, index) => {
+ if (m.sampleId == tree.id) {
+ m.children = res.data;
+ }
+ });
+ resolve(res.data);
+ this.recursionTreeTableData(
+ this.revokeData,
+ this.treeTableData
+ );
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
} else if (this.deleteTilte == "鎾ら攢瀹℃牳") {
// 鏄惁鏄俯搴﹀惊鐜�
if (tree.temperature) {
- this.$axios
- .get(
- this.$api.insOrder.revokeReviewTemperatureByProductId +
- "?productId=" +
- tree.id
- )
+ revokeReviewTemperatureByProductId({ productId: tree.id })
.then((res) => {
- resolve(res.data);
- treeNode.loading = false;
+ if (res.code === 200) {
+ resolve(res.data);
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
// 鏄惁鏄惊鐜鏁�
else if (tree.temperatureNumber) {
- this.$axios
- .get(
- this.$api.insOrder.revokeReviewConsistentByProductId +
- "?parentId=" +
- tree.parentId +
- "&inspectionItem=" +
- tree.inspectionItemTwo
- )
+ revokeReviewConsistentByProductId({
+ parentId: tree.parentId,
+ inspectionItem: tree.inspectionItemTwo,
+ })
.then((res) => {
- resolve(res.data);
- treeNode.loading = false;
+ if (res.code === 200) {
+ resolve(res.data);
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
} else {
- this.$axios
- .get(
- this.$api.insOrder.revokeReviewProduct +
- "?sampleId=" +
- tree.id +
- "&orderId=" +
- this.orderId
- )
+ revokeReviewProduct({
+ sampleId: tree.id,
+ orderId: this.orderId,
+ })
.then((res) => {
- resolve(res.data);
- treeNode.loading = false;
+ if (res.code === 200) {
+ resolve(res.data);
+ treeNode.loading = false;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
}
}
@@ -1744,18 +2008,20 @@
this.quashDialogVisible = true;
this.insOrderRow = row;
} else {
- // this.componentDataDelete.entity.orderId = row.id
this.orderId = row.id;
- this.$axios
- .get(this.$api.insOrder.selectSampleByOrderId + "?orderId=" + row.id)
+ selectSampleByOrderId({
+ orderId: row.id,
+ })
.then((res) => {
- console.log("res", res);
- this.treeTableData = res.data;
- this.treeTableData2 = JSON.parse(JSON.stringify(res.data));
+ if (res.code === 200) {
+ this.treeTableData = res.data;
+ this.treeTableData2 = JSON.parse(JSON.stringify(res.data));
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
this.revocationInsProductIds = "";
- this.componentDataDelete.showSelect = true;
- this.componentDataDelete.select = true;
this.deleteTilte = "鎾ら攢";
this.deleteDialogVisible = true;
}
@@ -1805,25 +2071,13 @@
}
});
productIds = [...new Set(productIds)];
- console.log("data", data);
- console.log("data1", data1);
}
- //
-
- console.log("sampleId", sampleIds);
- console.log("productIds", productIds);
let data = {
orderId: this.orderId,
sampleIds: sampleIds,
productIds: productIds,
};
- this.$axios
- .post(this.$api.insOrder.revoke, data, {
- headers: {
- "Content-Type": "application/json",
- },
- noQs: true,
- })
+ revoke(data)
.then((res) => {
if (res.code === 200) {
this.deleteDialogVisible = false;
@@ -1832,47 +2086,14 @@
this.refreshTable();
this.$message.success("鎾ら攢鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
- console.log("revokeData", this.revokeData);
- console.log("data", data);
- // 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("鏇存柊鎴愬姛");
- // }
- // });
-
- this.axios
- .get(this.$api.insOrder.revocationPassed + "?orderId=" + this.orderId)
+ revocationPassed({
+ orderId: this.orderId,
+ })
.then((res) => {
if (res.code === 200) {
this.printLoading = false;
@@ -1880,28 +2101,26 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
}
},
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;
-
this.orderId = row.id;
this.revocationInsProductIds = row.revocationInsProductIds;
- this.componentDataDelete.showSelect = false;
- this.componentDataDelete.select = false;
this.deleteTilte = "鎾ら攢瀹℃牳";
- this.$axios
- .get(this.$api.insOrder.revokeReviewSample + "?orderId=" + row.id)
+ revokeReviewSample({
+ orderId: row.id,
+ })
.then((res) => {
- console.log("鎾ら攢瀹℃牳鏍峰搧鏌ヨ", res);
- this.treeTableData = res.data;
+ if (res.code === 200) {
+ this.treeTableData = res.data;
+ }
+ })
+ .catch((error) => {
+ console.error(error);
});
this.deleteDialogVisible = true;
},
@@ -1910,24 +2129,9 @@
this.deleteDialogVisible = false;
this.revokeData = [];
} 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("鏇存柊鎴愬姛");
- // }
- // });
- this.axios
- .get(this.$api.insOrder.revocationCancel + "?orderId=" + this.orderId)
+ revocationCancel({
+ orderId: this.orderId,
+ })
.then((res) => {
if (res.code === 200) {
this.printLoading = false;
@@ -1935,26 +2139,32 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
}
},
// 涓嬪彂
handleIssued(row) {
this.issuedDialogVisible = true;
- this.$axios
- .post(this.$api.insOrder.selectOrderManDay, {
- id: row.id,
- })
+ 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,
+ if (res.code === 200) {
+ this.distributeData.orderId = row.id;
+ this.distributeData.sampleId = row.sampleId;
+ this.distributeData.appointed = res.data;
+ this.distributeData.type = row.type;
+ }
})
+ .catch((error) => {
+ console.error(error);
+ });
+ upPlanUser2({
+ orderId: row.id,
+ })
.then((res) => {
if (res.code === 200 && res.data.length > 0) {
this.sonLaboratoryList = [];
@@ -1965,6 +2175,9 @@
});
});
}
+ })
+ .catch((error) => {
+ console.error(error);
});
},
submitForm2() {
@@ -1992,22 +2205,13 @@
return;
}
this.upLoad = true;
- this.$axios
- .post(
- this.$api.insOrder.upInsOrder,
- {
- orderId: this.distributeData.orderId,
- sampleId: this.distributeData.sampleId,
- appointed: this.distributeData.appointed,
- userIdList: [this.distributeData.userId],
- sonLaboratory: this.distributeData.sonLaboratory,
- },
- {
- headers: {
- "Content-Type": "application/json",
- },
- }
- )
+ upInsOrder({
+ orderId: this.distributeData.orderId,
+ sampleId: this.distributeData.sampleId,
+ appointed: this.distributeData.appointed,
+ userIdList: [this.distributeData.userId],
+ sonLaboratory: this.distributeData.sonLaboratory,
+ })
.then((res) => {
if (res.code === 201) {
this.upLoad = false;
@@ -2018,7 +2222,8 @@
this.issuedDialogVisible = false;
this.refreshTable();
})
- .catch((e) => {
+ .catch((error) => {
+ console.error(error);
this.$message.error("淇敼澶辫触");
this.upLoad = false;
});
@@ -2026,10 +2231,9 @@
submitForm() {
this.upLoad = true;
if (this.tabIndex == 1) {
- this.axios
- .put(
- this.$api.insOrder.updateInspected + "?id=" + this.insOrderRow.id
- )
+ updateInspected({
+ id: this.insOrderRow.id,
+ })
.then((res) => {
if (res.code === 200) {
this.upLoad = false;
@@ -2037,10 +2241,14 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
} else {
- this.axios
- .put(this.$api.insOrder.updateStatus + "?id=" + this.insOrderRow.id)
+ updateStatus({
+ id: this.insOrderRow.id,
+ })
.then((res) => {
if (res.code === 200) {
this.upLoad = false;
@@ -2048,75 +2256,29 @@
this.refreshTable();
this.$message.success("鏇存柊鎴愬姛");
}
+ })
+ .catch((error) => {
+ console.error(error);
});
}
- 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;
},
// 涓嬪崟
playOrder(num) {
+ // this.active = num;
+ // this.examine = 0;
this.$router.push({
name: "addOrder",
- params: {},
+ query: {
+ active: num,
+ examine: 0,
+ isPlan: false,
+ },
});
- this.active = num;
- this.examine = 0;
- // this.refreshTable();
},
handleTab(m, i) {
this.tabIndex = i;
this.queryParams.state = m.value;
this.getList();
- },
- 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;
- });
},
changeUser() {
if (this.sonLaboratoryList.length > 0) {
@@ -2199,11 +2361,11 @@
margin-bottom: 16px;
}
-.box-card>>>.el-radio__inner {
+.box-card >>> .el-radio__inner {
border-radius: 2px !important;
}
-.box-card>>>.el-radio__input.is-checked .el-radio__inner::after {
+.box-card >>> .el-radio__input.is-checked .el-radio__inner::after {
content: "";
width: 8px;
height: 3px;
@@ -2220,15 +2382,15 @@
background: none;
}
->>>.el-radio__label {
+>>> .el-radio__label {
color: #000 !important;
}
-.el-dialog__body>>>.el-radio__label {
+.el-dialog__body >>> .el-radio__label {
font-size: 8px;
}
-.el-dialog__body>>>.el-radio__input.is-checked .el-radio__inner::after {
+.el-dialog__body >>> .el-radio__input.is-checked .el-radio__inner::after {
content: "";
width: 4px;
height: 3px;
@@ -2245,36 +2407,36 @@
background: none;
}
->>>.el-radio__input.is-disabled.is-checked .el-radio__inner {
+>>> .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 {
+.el-dialog__body >>> .el-radio__input.is-disabled.is-checked .el-radio__inner {
background: transparent;
}
-.el-dialog__body>>>.el-radio__inner {
+.el-dialog__body >>> .el-radio__inner {
width: 8px !important;
height: 8px !important;
}
-.el-dialog__body>>>.el-radio__label {
+.el-dialog__body >>> .el-radio__label {
padding-left: 2px !important;
}
-.el-dialog__body>>>.el-card__body {
+.el-dialog__body >>> .el-card__body {
padding: 0 !important;
}
-.el-dialog__body>>>.el-card {
+.el-dialog__body >>> .el-card {
border: none;
}
-.el-dialog__body>>>.el-radio__input.is-disabled .el-radio__inner {
+.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 {
+.el-dialog__body >>> .el-radio__input.is-disabled.is-checked .el-radio__inner {
border: none !important;
}
--
Gitblit v1.9.3