From 2b6e530143e59eae4d3a35eae0cf1620decfe698 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:32:47 +0800
Subject: [PATCH] 报告编制修改
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 203 ++++++++++++++++++++++----------------------------
1 files changed, 90 insertions(+), 113 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 5394e0b..47973df 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -9,11 +9,9 @@
</el-radio-group>
</el-col>
<el-col :span="12" style="text-align: right;">
- <el-upload v-if="radio === 0" ref='upload1'
- style="display: inline;margin-right: 8px"
- :action="uploadAction1"
- :before-upload="beforeUpload1" :headers="token" :on-error="onError1"
- :on-success="handleSuccessUp1" :show-file-list="false" accept='.doc,.docx,.xls,.xlsx'>
+ <el-upload v-if="radio === 0" ref='upload1' style="display: inline;margin-right: 8px" :action="uploadAction1"
+ :before-upload="beforeUpload1" :headers="token" :on-error="onError1" :on-success="handleSuccessUp1"
+ :show-file-list="false" accept='.doc,.docx,.xls,.xlsx'>
<el-button size="small" type="primary">瀵煎叆</el-button>
</el-upload>
<el-button size="small" type="primary" v-if="radio === 1" @click="uploadDia = true">瀵煎叆</el-button>
@@ -23,19 +21,19 @@
</div>
<div>
<el-form :model="itemParameterForm" ref="itemParameterForm" size="small" :inline="true">
- <el-form-item label="妫�楠岄」" prop="inspectionItem" v-if="radio===0">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterForm.inspectionItem" @keyup.enter.native="refreshTable()">
+ <el-form-item label="妫�楠岄」" prop="inspectionItem" v-if="radio === 0">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="itemParameterForm.inspectionItem"
+ @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽瓙椤�" prop="inspectionItemSubclass" v-if="radio===0">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterForm.inspectionItemSubclass" @keyup.enter.native="refreshTable()">
+ <el-form-item label="妫�楠屽瓙椤�" prop="inspectionItemSubclass" v-if="radio === 0">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="itemParameterForm.inspectionItemSubclass"
+ @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽璞�" prop="specimenName">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
+ <el-form-item label="妫�楠屽璞�" prop="sample">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="itemParameterForm.sample"
+ @keyup.enter.native="refreshTable()">
</el-input>
</el-form-item>
<el-form-item>
@@ -43,23 +41,22 @@
<el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
</el-form-item>
</el-form>
-<!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
- <div class="table" v-if="radio===0">
- <lims-table :tableData="tableData" :column="column" key="tableData"
- @pagination="pagination" :height="'calc(100vh - 290px)'"
- :page="page" :tableLoading="tableLoading"></lims-table>
+ <!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
+ <div class="table" v-if="radio === 0">
+ <lims-table :tableData="tableData" :column="column" key="tableData" @pagination="pagination"
+ :height="'calc(100vh - 290px)'" :page="page" :tableLoading="tableLoading"></lims-table>
</div>
-<!-- 妫�楠屽璞¤〃鏍�-->
- <div class="table" v-if="radio===1">
+ <!-- 妫�楠屽璞¤〃鏍�-->
+ <div class="table" v-if="radio === 1">
<lims-table :tableData="testObjectTableData" :column="testObjectColumn" key="testObjectTableData"
- @pagination="pagination" :height="'calc(100vh - 290px)'"
- :page="testObjectPage" :tableLoading="tableLoading"></lims-table>
+ @pagination="pagination" :height="'calc(100vh - 290px)'" :page="testObjectPage"
+ :tableLoading="tableLoading"></lims-table>
</div>
</div>
<!--浜у搧缁存姢寮规-->
<el-dialog title="浜у搧缁存姢" :visible.sync="diaProduct" width="900px">
- <lims-table :tableData="productData" :column="productColumn" height="460"
- :page="productPage" :tableLoading="productableLoading"></lims-table>
+ <lims-table :tableData="productData" :column="productColumn" height="460" :page="productPage"
+ :tableLoading="productableLoading"></lims-table>
<span slot="footer" class="dialog-footer">
<el-button @click="diaProduct = false">鍙� 娑�</el-button>
<el-button type="primary" @click="editProduct('add')" :loading="productLoad">鏂� 澧�</el-button>
@@ -67,7 +64,8 @@
</el-dialog>
<!--浜у搧缁存姢缂栬緫-->
<el-dialog title="鎿嶄綔浜у搧缁存姢" :visible.sync="productEditDia" width="400px">
- <el-form :model="productEditForm" ref="productEditForm" :rules="productRules" label-position="right" label-width="100px">
+ <el-form :model="productEditForm" ref="productEditForm" :rules="productRules" label-position="right"
+ label-width="100px">
<el-form-item label="浜у搧鍚嶇О" prop="name">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="productEditForm.name"></el-input>
</el-form-item>
@@ -83,11 +81,9 @@
</el-dialog>
<el-dialog :visible.sync="uploadDia" title="鏁版嵁瀵煎叆" width="500px">
<div style="margin: 0 auto;">
- <el-upload ref="upload" :action="uploadAction"
- :auto-upload="false" :file-list="fileList"
- :headers="token" :limit="1"
- :on-change="beforeUpload" :on-error="onError" :on-success="onSuccess" accept=".xlsx" drag
- name="file">
+ <el-upload ref="upload" :action="uploadAction" :auto-upload="false" :file-list="fileList" :headers="token"
+ :limit="1" :on-change="beforeUpload" :on-error="onError" :on-success="onSuccess" accept=".xlsx" drag
+ name="file">
<i class="el-icon-upload"></i>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
</el-upload>
@@ -112,11 +108,11 @@
import limsTable from "@/components/Table/lims-table.vue";
import EditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue";
import testObjectEditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue";
-import {getToken} from "@/utils/auth";
+import { getToken } from "@/utils/auth";
import { obtainItemParameterList } from '@/api/structural/laboratoryScope'
export default {
- components: {limsTable, EditForm, testObjectEditForm},
+ components: { limsTable, EditForm, testObjectEditForm },
data() {
return {
uploadAction: process.env.VUE_APP_BASE_API + '/capacityScope/importExcel',
@@ -124,24 +120,24 @@
tableData: [],
tableLoading: false,
column: [
- {label: '妫�楠岄」', prop: 'inspectionItem'},
- {label: '妫�楠岄」EN', prop: 'inspectionItemEn'},
- {label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass'},
- {label: '妫�楠屽瓙椤笶N', prop: 'inspectionItemSubclassEn'},
- {label: '妫�楠岄」鍒嗙被', prop: 'inspectionItemClass'},
- {label: '妫�楠岄」鍒嗙被EN', prop: 'inspectionItemClassEn'},
- {label: '妫�楠屽璞�', prop: 'sample'},
- {label: '鍗曚环(鍏�)', prop: 'price'},
- {label: '璇曢獙瀹�', prop: 'sonLaboratory'},
- {label: '瑕佹眰鎻忚堪', prop: 'askTell'},
- {label: '瑕佹眰鍊�', prop: 'ask'},
- {label: '璁￠噺鍗曚綅', prop: 'unit'},
- {label: '宸ユ椂(H)', prop: 'manHour'},
- {label: '棰勮鏃堕棿(H)', prop: 'manDay'},
- {label: '宸ユ椂鍒嗙粍', prop: 'manHourGroup'},
- {label: '鍒涘缓鏃堕棿', prop: 'createTime'},
- {label: '淇敼鏃堕棿', prop: 'updateTime'},
- {label: '鏉′欢', prop: 'radiusList'},
+ { label: '妫�楠岄」', prop: 'inspectionItem' },
+ { label: '妫�楠岄」EN', prop: 'inspectionItemEn' },
+ { label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass' },
+ { label: '妫�楠屽瓙椤笶N', prop: 'inspectionItemSubclassEn' },
+ { label: '妫�楠岄」鍒嗙被', prop: 'inspectionItemClass' },
+ { label: '妫�楠岄」鍒嗙被EN', prop: 'inspectionItemClassEn' },
+ { label: '妫�楠屽璞�', prop: 'sample' },
+ { label: '鍗曚环(鍏�)', prop: 'price' },
+ { label: '璇曢獙瀹�', prop: 'sonLaboratory' },
+ { label: '瑕佹眰鎻忚堪', prop: 'askTell' },
+ { label: '瑕佹眰鍊�', prop: 'ask' },
+ { label: '璁￠噺鍗曚綅', prop: 'unit' },
+ { label: '宸ユ椂(H)', prop: 'manHour' },
+ { label: '棰勮鏃堕棿(H)', prop: 'manDay' },
+ { label: '宸ユ椂鍒嗙粍', prop: 'manHourGroup' },
+ { label: '鍒涘缓鏃堕棿', prop: 'createTime' },
+ { label: '淇敼鏃堕棿', prop: 'updateTime' },
+ { label: '鏉′欢', prop: 'radiusList' },
{
dataType: 'action',
fixed: 'right',
@@ -166,9 +162,9 @@
}
],
page: {
- total:0,
- size:10,
- current:1
+ total: 0,
+ size: 10,
+ current: 1
},
testObjectTableData: [],
testObjectColumn: [
@@ -179,9 +175,9 @@
minWidth: '130',
formatData: (params) => {
let index = this.laboratoryList.findIndex(item => item.value == params)
- if(index > -1) {
+ if (index > -1) {
return this.laboratoryList[index].label
- }else {
+ } else {
return null
}
// if (params == 1) {
@@ -210,34 +206,14 @@
}
}
},
- {label: '妫�楠屽璞�', prop: 'specimenName'},
- {label: '妫�楠屽璞N', prop: 'specimenNameEn'},
- {label: '浜у搧', prop: 'product'},
- {label: '瀵硅薄浠ｅ彿', prop: 'code'},
- {label: '瀵硅薄绫诲瀷', prop: 'objectType',
- dataType: 'tag',
- formatData: (params) => {
- if (params == 1) {
- return '鍘熸潗鏂�'
- } else if (params == 2) {
- return '鎴愬搧'
- } else {
- return '杈呮潗'
- }
- },
- formatType: (params) => {
- if (params == 1) {
- return 'success'
- } else if (params == 2) {
- return 'info'
- } else {
- return 'warning'
- }
- }},
- {label: '鍒涘缓浜�', prop: 'createUserName'},
- {label: '鏇存柊浜�', prop: 'updateUserName'},
- {label: '鍒涘缓鏃堕棿', prop: 'createTime'},
- {label: '鏇存柊鏃堕棿', prop: 'updateTime'},
+ { label: '妫�楠屽璞�', prop: 'specimenName' },
+ { label: '妫�楠屽璞N', prop: 'specimenNameEn' },
+ { label: '浜у搧', prop: 'product' },
+ { label: '瀵硅薄浠ｅ彿', prop: 'code' },
+ { label: '鍒涘缓浜�', prop: 'createUserName' },
+ { label: '鏇存柊浜�', prop: 'updateUserName' },
+ { label: '鍒涘缓鏃堕棿', prop: 'createTime' },
+ { label: '鏇存柊鏃堕棿', prop: 'updateTime' },
{
dataType: 'action',
fixed: 'right',
@@ -269,9 +245,9 @@
}
],
testObjectPage: {
- total:0,
- size:10,
- current:0
+ total: 0,
+ size: 10,
+ current: 0
},
addOrUpdate: '',
tree: null,
@@ -285,8 +261,8 @@
productLoad: false,
diaProduct: false,
productColumn: [
- {label: '浜у搧鍚嶇О', prop: 'name'},
- {label: '浜у搧鍚嶇ОEN', prop: 'nameEn'},
+ { label: '浜у搧鍚嶇О', prop: 'name' },
+ { label: '浜у搧鍚嶇ОEN', prop: 'nameEn' },
{
dataType: 'action',
label: '鎿嶄綔',
@@ -310,9 +286,9 @@
],
productData: [],
productPage: {
- total:0,
- size:10,
- current:0,
+ total: 0,
+ size: 10,
+ current: 0,
layout: 'total, prev, pager, next'
},
productableLoading: false,
@@ -331,9 +307,9 @@
},
uploadDia: false,
fileList: [],
- token: {Authorization: "Bearer " + getToken()},
+ token: { Authorization: "Bearer " + getToken() },
uploading: false,
- laboratoryList:[]
+ laboratoryList: []
}
},
created() {
@@ -394,7 +370,7 @@
return true;
}
},
- handleSuccessUp1 (response, file, fileList) {
+ handleSuccessUp1(response, file, fileList) {
this.$refs.upload1.clearFiles()
if (response.code !== 200) {
this.$message.error(response.msg)
@@ -403,16 +379,16 @@
this.$message.success('涓婁紶鎴愬姛')
this.refreshTable()
},
- refreshList () {
+ refreshList() {
this.refreshTable()
},
- refreshList1 () {
+ refreshList1() {
this.refreshTable()
},
refreshTable() {
this.tableLoading = true
if (this.radio === 0) {
- selectItemParameterList({...this.page, ...this.itemParameterForm}).then(res => {
+ selectItemParameterList({ ...this.page, ...this.itemParameterForm }).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.tableData = res.data.records
@@ -422,7 +398,7 @@
this.tableLoading = false
})
} else {
- selectTestObjectList({...this.testObjectPage, ...this.itemParameterForm}).then(res => {
+ selectTestObjectList({ ...this.testObjectPage, ...this.itemParameterForm }).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.testObjectTableData = res.data.records
@@ -438,7 +414,7 @@
this.page.current = 1
this.refreshTable()
},
- pagination (page) {
+ pagination(page) {
this.page.size = page.limit
this.refreshTable()
},
@@ -451,17 +427,17 @@
}
},
// 妫�楠岄」鐩弬鏁�-鎵撳紑淇敼寮规
- editForm (row) {
+ editForm(row) {
this.$refs.editForm.openDia('edit', row)
},
// 妫�楠岄」鐩弬鏁�-鍒犻櫎
- delete (row) {
+ delete(row) {
this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- delItemParameter({id:row.id}).then(res => {
+ delItemParameter({ id: row.id }).then(res => {
if (res.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛')
this.refreshTable();
@@ -475,17 +451,17 @@
})
},
// 妫�楠屽璞�-鎵撳紑淇敼寮规
- editTestObjectForm (row) {
+ editTestObjectForm(row) {
this.$refs.testObjectEditForm.openDia('edit', row)
},
// 妫�楠岄」鐩弬鏁�-鍒犻櫎
- deleteTest (row) {
+ deleteTest(row) {
this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- delTestObject({id:row.id}).then(res => {
+ delTestObject({ id: row.id }).then(res => {
if (res.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛')
this.refreshTable();
@@ -504,12 +480,12 @@
this.objectId = row.id
this.getProductList(row)
},
- getProductList () {
+ getProductList() {
const params = {
objectId: this.objectId,
}
this.productableLoading = true
- selectProductListByObjectId({...params, ...this.productPage}).then(res => {
+ selectProductListByObjectId({ ...params, ...this.productPage }).then(res => {
this.productableLoading = false
this.productData = res.data.records
this.productPage.total = res.data.total
@@ -518,7 +494,7 @@
})
},
// 浜у搧缁存姢-鏂板-缂栬緫
- editProduct (type, row) {
+ editProduct(type, row) {
this.productEditDia = true
this.operationType = type
if (type === 'edit') {
@@ -526,7 +502,7 @@
}
},
// 鎻愪氦浜у搧缁存姢淇敼
- submitProduct () {
+ submitProduct() {
this.$refs['productEditForm'].validate((valid) => {
if (valid) {
this.uploading = true
@@ -562,13 +538,13 @@
this.productEditDia = false
},
// 浜у搧缁存姢-鍒犻櫎
- deleteProduct (row) {
+ deleteProduct(row) {
this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- delProduct({id:row.id}).then(res => {
+ delProduct({ id: row.id }).then(res => {
if (res.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛')
this.getProductList();
@@ -581,7 +557,7 @@
});
})
},
- getItemParameterList(){
+ getItemParameterList() {
obtainItemParameterList().then(res => {
let data = []
res.data.forEach(a => {
@@ -601,6 +577,7 @@
.capacity-scope {
padding: 20px;
}
+
.title {
height: 40px;
line-height: 40px;
--
Gitblit v1.9.3