From d2d2bef221476379cc15469568edf37dedbdd952 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 22:44:36 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b2-standard.vue | 6 ++-
src/components/view/a5-capacity-scope.vue | 71 +++++++++++++++++++++++++++++++++++
src/components/view/b1-inspection-order.vue | 13 ++++--
src/assets/api/controller.js | 1
4 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index d5e16a7..75eda06 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -124,6 +124,7 @@
upProduct: "/capacityScope/upProduct", //淇敼浜у搧
getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
+ importExcel: "/capacityScope/importExcel", // 瀵煎叆鑳藉姏鑼冨洿
}
const laboratoryScope = {
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 55e1e40..34de083 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -38,6 +38,14 @@
height: calc(100% - 60px - 80px - 10px - 40px);
padding: 20px;
}
+
+ >>> .el-upload {
+ width: 100% !important;
+ }
+
+ >>> .el-upload-dragger {
+ width: 100% !important;
+ }
</style>
<template>
@@ -56,8 +64,9 @@
<el-button size="medium" @click="$refs.itemParameterTable.openUpload()" v-if="inPower">
<i class="el-icon-upload2" style="color: #3A7BFA;"></i>
<span style="color: #3A7BFA;">瀵煎叆</span></el-button>
+ <el-button size="medium" type="primary" v-if="radio == 1 && importExcel" @click="uploadDia = true">瀵煎叆</el-button>
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
- <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button>
+ <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button>
</el-col>
</el-row>
</div>
@@ -118,6 +127,20 @@
<span slot="footer" class="dialog-footer">
<el-button @click="diaProduct = false">鍙� 娑�</el-button>
<el-button type="primary" @click="openAdd2" :loading="productLoad">鏂� 澧�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
+ <div style="margin: 0 auto;">
+ <el-upload ref="upload" drag :action="javaApi + $api.capacityScope.importExcel" :headers="token" :file-list="fileList" name="file"
+ :auto-upload="false" accept=".xlsx" :limit="1" :on-change="beforeUpload" :on-success="onSuccess"
+ :on-error="onError">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ </el-upload>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="uploadDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitUpload()" :loading="uploading">涓� 浼�</el-button>
</span>
</el-dialog>
</div>
@@ -320,9 +343,17 @@
requiredUp: ['name','nameEn'],
},
inPower: true,
+ importExcel: false,
+ uploadDia: false,
+ fileList: [],
+ token: null,
+ uploading: false,
}
},
mounted() {
+ this.token = {
+ 'token': sessionStorage.getItem('token')
+ },
this.itemParameterEntityCopy = this.HaveJson(this.itemParameterData.entity)
this.testObjectDataEntityCopy = this.HaveJson(this.testObjectData.entity)
this.selectEnumByCategory()
@@ -339,6 +370,39 @@
this.getPower('0')
},
methods: {
+ submitUpload() {
+ if (this.$refs.upload.uploadFiles.length == 0) {
+ this.$message.error('鏈�夋嫨鏂囦欢')
+ return
+ }
+ this.uploading = true
+ this.$refs.upload.submit();
+ },
+ onSuccess(response, file, fileList) {
+ this.$refs.upload.clearFiles()
+ this.uploadDia = false
+ this.uploading = false
+ if (response.code == 201) {
+ this.$message.error(response.message)
+ return
+ }
+ this.$message.success('涓婁紶鎴愬姛')
+ this.standardList = []
+ this.productList = []
+ this.refreshTable()
+ },
+ onError(err, file, fileList) {
+ this.$message.error('涓婁紶澶辫触')
+ this.$refs.upload.clearFiles()
+ this.uploading = false
+ },
+ beforeUpload(file, fileList) {
+ if (file.raw.type != 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+ this.$message.error('涓婁紶鏂囦欢鏍煎紡涓嶆纭�');
+ this.$refs.upload.clearFiles()
+ return false;
+ }
+ },
selectorSwitch(radio) {
if (this.radio === '0') {
this.showItemParameter = true;
@@ -514,6 +578,7 @@
let product = false
let select = 0
let inPower=false
+ let importExcel = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'selectItemParameterList') {
select += 1
@@ -547,6 +612,9 @@
if (power[i].menuMethod == 'selectProductListByObjectId') {
product = true
}
+ if (power[i].menuMethod == 'importExcel') {
+ importExcel = true
+ }
}
}
if (radio === '0') {
@@ -570,6 +638,7 @@
this.addPower = add
this.inPower=inPower
this.select = select
+ this.importExcel = importExcel
if (select == 1 || select == 3) this.radio = radio
else if (select == 2) this.radio = '1'
else this.radio = '-1'
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 8889305..0bb2399 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -120,10 +120,13 @@
height: 8px !important;
}
.el-dialog__body >>>.el-radio__label{
- padding-left: 2px !important;
+ 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;
@@ -369,16 +372,16 @@
</el-row>
</span>
</el-dialog>
- <div class="el-dialog__body" style="overflow-y: auto;position: absolute;margin-top: 0;position: fixed;top: 0;z-index: 99999;">
+ <div class="el-dialog__body" style="overflow-y: auto;position: absolute;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
<div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;box-shadow: none;margin-bottom: 6px;padding-left: 160px;display: none;" >
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-after: always;color: #000;box-shadow: none;" >
<div style="display: flex;">
<div>
- <el-col :span="8" :offset="4">
+ <el-col :span="10" :offset="2">
<vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 40px;line-height: 9px;">
+ <div style="margin-left: 12px;line-height: 9px;">
<el-row>
<el-col style="font-size: 8px;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
</el-row>
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 9c1979c..c456519 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -505,7 +505,7 @@
</el-dialog>
<el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
<div style="margin: 0 auto;">
- <el-upload ref="upload" drag :action="javaApi + $api.standardTree.inExcelOfTree" :headers="token" :file-list="fileList" name="file"
+ <el-upload ref="upload" drag :action="javaApi + $api.standardTree.inExcelOfTree + '/' + isEquipment" :headers="token" :file-list="fileList" name="file"
:auto-upload="false" accept=".xlsx" :limit="1" :on-change="beforeUpload" :on-success="onSuccess"
:on-error="onError">
<i class="el-icon-upload"></i>
@@ -632,6 +632,7 @@
fileList: [],
inExcelOfTreePower: false,
uploading: false,
+ isEquipment: false,
}
},
watch: {
@@ -670,7 +671,8 @@
this.selectStandardMethods()
this.token = {
'token': sessionStorage.getItem('token')
- }
+ },
+ this.isEquipment = this.PROJECT === '瑁呭鐢电紗' ? true : false
},
methods: {
filterNode(value, data) {
--
Gitblit v1.9.3