From a6fdbed4f31530c080b591d78c141e561db78967 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 28 九月 2026 09:35:01 +0800
Subject: [PATCH] feat(inspection): 更新检测类型选项并移除湿度字段 - 将"委托试验"改为"委托检验"，增加委托检测、实验室间比对、能力验证等检测类型 - 移除所有表单中的湿度相关字段及验证逻辑 - 在报告准备界面添加印章选择功能，支持MA章、报告章、骑缝章的位置选择 - 优化报告结果流程界面，增加报告下载功能和领报告相关信息字段 - 新增印章管理系统，支持印章的增删改查和图片上传功能
---
src/views/CNAS/process/demand/index.vue | 135 ++++++--------------------------------------
1 files changed, 20 insertions(+), 115 deletions(-)
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index 2674424..8dc84a2 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -19,23 +19,21 @@
@keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
<el-form-item>
- <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
- <div style="text-align: right; margin-bottom: 20px">
- <el-button size="small" type="primary" @click="goAdd">鏂板</el-button>
- </div>
<div class="table">
- <el-table v-loading="tableListLoading" :data="tableList" height="530" style="width: 100%">
- <el-table-column align="center" label="搴忓彿" type="index" width="60"></el-table-column>
- <el-table-column label="璇曟牱鍚嶇О" prop="sampleName" show-overflow-tooltip width="120"></el-table-column>
- <el-table-column label="濮旀墭缂栧彿" prop="entrustCode" show-overflow-tooltip width="120"></el-table-column>
- <el-table-column label="濮旀墭鏃堕棿" prop="commissionDate" width="120"></el-table-column>
- <el-table-column label="鍨嬪彿" prop="modelNo"></el-table-column>
- <el-table-column label="濮旀墭鍗曚綅" prop="commissionUnit" show-overflow-tooltip width="120"></el-table-column>
- <el-table-column label="鐢熶骇鍗曚綅" prop="production" show-overflow-tooltip width="120"></el-table-column>
+ <el-table v-loading="tableListLoading" :data="tableList"
+ height="630" border :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
+ <el-table-column align="center" label="搴忓彿" type="index"></el-table-column>
+ <el-table-column label="璇曟牱鍚嶇О" prop="sampleName" show-overflow-tooltip></el-table-column>
+ <el-table-column label="濮旀墭缂栧彿" prop="entrustCode" show-overflow-tooltip></el-table-column>
+ <el-table-column label="濮旀墭鏃堕棿" prop="commissionDate" show-overflow-tooltip></el-table-column>
+ <el-table-column label="鍨嬪彿" prop="modelNo" show-overflow-tooltip></el-table-column>
+ <el-table-column label="濮旀墭鍗曚綅" prop="commissionUnit" show-overflow-tooltip></el-table-column>
+ <el-table-column label="鐢熶骇鍗曚綅" prop="production" show-overflow-tooltip></el-table-column>
<el-table-column label="濮旀墭浜�" prop="commissionUser"></el-table-column>
<el-table-column label="鏍峰搧鏁伴噺" prop="quantity"></el-table-column>
<el-table-column label="鏍峰搧鐘舵��" prop="sampleStatus"></el-table-column>
@@ -45,13 +43,13 @@
<span v-if="scope.row.isLeave === 0">鍚�</span>
</template>
</el-table-column>
- <el-table-column label="鏍峰搧澶勭悊鏂瑰紡" prop="processing">
+ <el-table-column label="鏍峰搧澶勭悊鏂瑰紡" prop="processing" width="150">
<template slot-scope="scope">
<span v-if="scope.row.processing === 1">瀹為獙瀹ゅ鐞�</span>
<span v-if="scope.row.processing === 0">濮旀墭鍗曚綅鍙栧洖</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鎿嶄綔" width="240" fixed="right">
+ <el-table-column align="center" label="鎿嶄綔" width="240">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="goUpdate(scope.row)">缂栬緫</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)">鏌ョ湅</el-button>
@@ -71,38 +69,13 @@
@current-change="handleCurrentChange1">
</el-pagination>
</div>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="orderRowsVisible"
- title="鏂板妫�楠屼换鍔″崟" width="1000px">
- <div style="display: flex; align-items: center;margin-bottom: 10px">
- <span style="width: 80px">濮旀墭缂栧彿锛�</span>
- <el-input v-model="entity.entrustCode" clearable size="small"
- style="width: 300px;margin-right: 10px"></el-input>
- <el-button size="small" type="primary" @click="searchTableData">鏌ヨ</el-button>
- <el-button size="small" @click="refreshTableData">閲� 缃�</el-button>
- </div>
- <el-table v-loading="tableLoading" :data="tableData" height="550" style="width: 100%">
- <el-table-column align="center" label="搴忓彿" type="index" width="60"></el-table-column>
- <el-table-column label="濮旀墭缂栧彿" prop="entrustCode"></el-table-column>
- <el-table-column label="鏍峰搧鍚嶇О" prop="sample"></el-table-column>
- <el-table-column align="center" label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button align="center" size="mini" type="text" @click="goAddOrder(scope.row)">鏂板濮旀墭鍗�</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination :current-page="1" :page-size="tableSearch.size" :page-sizes="[10, 20, 30, 50, 100]" :total="total"
- layout="->,total, sizes, prev, pager, next" style="margin-top: 10px" background @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
- </el-pagination>
- </el-dialog>
<el-dialog :class="{ downPdf: title == '涓嬭浇' }" :close-on-click-modal="false" :close-on-press-escape="false"
:modal="title != '涓嬭浇'" :title="title" :visible.sync="detailDialogVisible" top="20px" width="1200px">
<div style="max-height: 75vh;overflow-y: auto;">
<div id="dialogBody">
- <table border="1" cellpadding="10" class="tables heads" style="border: 1px dashed black;">
+ <table border="1" cellpadding="10" class="tables heads" style="border: 1px dashed black;width: 100%">
<tr>
<td rowspan="2">
- <img alt="" src="@/assets/logo/ZTTlogo.png" style="width: 80%;">
</td>
<td>
<p>璁板綍鍚嶇О锛氭楠屽鎵樺崟</p>
@@ -113,7 +86,7 @@
</tr>
<tr>
<td>
- <p>璁板綍缂栧彿锛� ZTT/QR-16-04-a</p>
+ <p>璁板綍缂栧彿锛�</p>
</td>
<td>
<p>褰掓。閮ㄩ棬锛氱患鍚堝</p>
@@ -130,7 +103,7 @@
<p v-if="operationType === 'view'" style="margin-top: 16px;margin-left: 600px;">濮旀墭缂栧彿锛歿{
currentInfo.entrustCode }}
</p>
- <table border="1" cellpadding="10" class="tables">
+ <table border="1" cellpadding="10" class="tables" style="width: 100%">
<tr>
<td colspan="2">
<p>璇曟牱鍚嶇О</p>
@@ -365,7 +338,7 @@
<p>妫�娴嬫満鏋勪俊鎭�</p>
</td>
<td colspan="3">
- <p>姹熻嫃涓ぉ绉戞妧鑲′唤鏈夐檺鍏徃妫�娴嬩腑蹇�</p>
+ <p>鏂拌仛</p>
</td>
</tr>
<tr>
@@ -384,8 +357,6 @@
</div>
<span v-if="operationType !== 'view'" slot="footer" class="dialog-footer">
<el-button @click="detailDialogVisible = false">鍙� 娑�</el-button>
- <el-button v-if="operationType === 'add'" :loading="buttonLoading" type="primary" @click="handleAdd">纭�
- 瀹�</el-button>
<el-button v-if="operationType === 'edit'" :loading="buttonLoading" type="primary" @click="handleEdit">纭�
瀹�</el-button>
</span>
@@ -404,8 +375,8 @@
<script>
import {
- addInspectionOrder, delInspectionOrder, exportInspectionOrder,
- getInsOrderOnInspection, getInspectionOrderByInsOderId, getInspectionOrderOne,
+ delInspectionOrder, exportInspectionOrder,
+ getInspectionOrderOne,
pageInspectionOrder,
updateInspectionOrder
} from "@/api/cnas/process/demand/demand";
@@ -413,7 +384,7 @@
import { selectUserCondition } from "@/api/business/inspectionTask";
export default {
- name: "a7-Inspection-Order-Form",
+ name: "Demand",
components: { limsTable },
data() {
return {
@@ -447,7 +418,6 @@
},
],
operationType: '',
- orderRowsVisible: false,
tableList: [],
tableListLoading: false,
pages: {
@@ -526,47 +496,6 @@
}
this.refreshTable()
},
- // 鎵撳紑鏂板寮规
- goAdd() {
- this.operationType = 'add'
- this.title = '鏂板妫�楠屽鎵樺崟';
- this.orderRowsVisible = true
- this.searchTableData()
- },
- // 鏌ヨ鍙柊澧炵殑妫�楠屽崟
- searchTableData() {
- this.tableLoading = true
- getInsOrderOnInspection({
- ...this.tableSearch,
- ...this.entity
- }).then(res => {
- this.tableLoading = false
- this.tableData = res.data.records
- this.total = res.data.total
- }).catch(err => {
- this.tableLoading = false
- })
- },
- // 閲嶇疆妫�楠屽崟鍒楄〃
- refreshTableData() {
- this.entity = {
- entrustCode: ''
- }
- this.tableSearch = {
- current: 1,
- size: 20,
- }
- this.searchTableData()
- },
- // 妫�楠屽崟鍒楄〃鍒嗛〉
- handleSizeChange(val) {
- this.tableSearch.size = val
- this.searchTableData();
- },
- handleCurrentChange(val) {
- this.tableSearch.current = val
- this.searchTableData();
- },
// 鍒楄〃鍒嗛〉
handleSizeChange1(val) {
this.pages.size = val
@@ -576,19 +505,6 @@
this.pages.current = val
this.refreshTable();
},
- // 鎻愪氦鏂板
- handleAdd() {
- this.buttonLoading = true
- addInspectionOrder(this.currentInfo).then(res => {
- this.buttonLoading = false
- this.$message.success('鏂板鎴愬姛')
- this.detailDialogVisible = false
- this.orderRowsVisible = false
- this.refreshTable()
- }).catch(err => {
- this.buttonLoading = false
- })
- },
// 鎻愪氦淇敼
handleEdit() {
this.buttonLoading = true
@@ -596,20 +512,9 @@
this.buttonLoading = false
this.$message.success('鏂板鎴愬姛')
this.detailDialogVisible = false
- this.orderRowsVisible = false
this.refreshTable()
}).catch(err => {
this.buttonLoading = false
- })
- },
- // 鏌ヨ闇�瑕佹柊澧炵殑濮旀墭鍗曡鎯�
- goAddOrder(row) {
- getInspectionOrderByInsOderId({ insOrderId: row.id }).then(res => {
- this.currentInfo = res.data
- this.title = '鏂板妫�楠屽鎵樺崟';
- this.detailDialogVisible = true
- }).catch(err => {
- console.log('err----', err)
})
},
// 鎵撳紑缂栬緫寮规
--
Gitblit v1.9.3