From 98810eb52a46ec72f2bc3d89be8ea42c33d55c5f Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 17 七月 2024 10:14:49 +0800
Subject: [PATCH] 日工时管理的辅助工时的录入数据,完成一个数据的录入后页面不跳转,但是弹窗的内容清空继续新增录入
---
src/components/view/a5-capacity-scope.vue | 134 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 115 insertions(+), 19 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 94936fc..34de083 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -38,13 +38,21 @@
height: calc(100% - 60px - 80px - 10px - 40px);
padding: 20px;
}
+
+ >>> .el-upload {
+ width: 100% !important;
+ }
+
+ >>> .el-upload-dragger {
+ width: 100% !important;
+ }
</style>
<template>
<div class="capacity-scope">
<div>
<el-row class="title">
- <el-col :span="12">
+ <el-col :span="12" style="text-align: left">
<el-radio-group v-model="radio" @input="selectorSwitch" size="medium" fill="#3A7BFA" v-if="select==3">
<el-radio-button label="0">妫�楠岄」鐩弬鏁�</el-radio-button>
<el-radio-button label="1">妫�楠屽璞�</el-radio-button>
@@ -53,6 +61,10 @@
<el-button size="medium" type="primary" v-else-if="select==2">妫�楠屽璞�</el-button>
</el-col>
<el-col :span="12" style="text-align: right;">
+ <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-col>
@@ -71,6 +83,12 @@
v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
+ <div class="search_thing">
+ <div class="search_label">妫�楠屽璞★細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterData.entity.sample" @keyup.enter.native="refreshTable()"></el-input>
+ </div>
+ </div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -79,7 +97,7 @@
<div class="table">
<ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList"
:upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
- :componentData="itemParameterData" :key="upIndex" />
+ :inputUrl="$api.capacityScope.importData" :componentData="itemParameterData" :key="upIndex" />
</div>
</div>
<div class="bodys">
@@ -104,11 +122,25 @@
<div class="body" v-if="diaProduct" style="height: 350px;overflow-y: auto;padding: 5px 0;">
<ValueTable ref="productData" :url="$api.capacityScope.selectProductListByObjectId"
:upUrl="$api.capacityScope.upProduct" :delUrl="$api.capacityScope.delProduct"
- :componentData="productData" :key="upIndex" />
+ :componentData="productData" :key="upIndex"/>
</div>
<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>
@@ -122,6 +154,7 @@
},
data() {
return {
+ logining:false,
radio: '-1',
showItemParameter: true,
showTestObject: false,
@@ -129,13 +162,14 @@
entity: {
inspectionItem: null,
inspectionItemSubclass: null,
+ sample: null,
orderBy: {
field: 'id',
order: 'asc'
}
},
- isIndex: false,
- showSelect: true,
+ isIndex: true,
+ showSelect: false,
select: true,
row: 2,
do: [{
@@ -217,15 +251,18 @@
props:{
value:'name',
label:'name',
- checkStrictly: false
+ checkStrictly: true,
+ multiple: true
}
},
- requiredAdd: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
- 'unit', 'method', 'price', 'manDay'
+ requiredAdd: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
],
- requiredUp: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
- 'unit', 'method', 'price', 'manDay'
- ]
+ requiredUp: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
+ ],
+ accept: '.xlsx',
+ inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
testObjectData: {
entity: {
@@ -235,8 +272,8 @@
order: 'asc'
}
},
- isIndex: false,
- showSelect: true,
+ isIndex: true,
+ showSelect: false,
select: true,
do: [{
id: 'update',
@@ -303,11 +340,20 @@
tagField: {},
selectField: {},
requiredAdd: ['name','nameEn'],
- requiredUp: ['name','nameEn']
- }
+ 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()
@@ -324,10 +370,44 @@
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;
this.showTestObject = false;
+ this.selectTestObjectByName()
/* this.$nextTick(() => {
this.$refs.itemParameterTable.selectList()
}) */
@@ -342,6 +422,7 @@
this.$refs['itemParameterTable'].selectList()
} else {
this.$refs['testObjectTable'].selectList()
+
}
},
refresh() {
@@ -424,14 +505,19 @@
obtainItemParameterList() {
this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
+ let data0 = []
res.data.forEach(a => {
data.push({
label: a.laboratoryName,
value: a.id
})
+ data0.push({
+ label: a.laboratoryName,
+ value: a.laboratoryName
+ })
})
- this.itemParameterData.selectField.laboratory.select = data
- this.itemParameterData.tagField.laboratory.select = data
+ this.itemParameterData.selectField.laboratory.select = data0
+ this.itemParameterData.tagField.laboratory.select = data0
this.testObjectData.selectField.laboratoryId.select = data
this.testObjectData.tagField.laboratoryId.select = data
this.laboratory = data
@@ -491,6 +577,8 @@
let del = false
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
@@ -498,7 +586,7 @@
if (power[i].menuMethod == 'selectTestObjectList') {
select += 2
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (power[i].menuMethod == 'upItemParameter') {
up = true
}
@@ -507,6 +595,9 @@
}
if (power[i].menuMethod == 'addItemParameter') {
add = true
+ }
+ if (power[i].menuMethod == 'importData') {
+ inPower = true
}
} else {
if (power[i].menuMethod == 'upTestObject') {
@@ -521,9 +612,12 @@
if (power[i].menuMethod == 'selectProductListByObjectId') {
product = true
}
+ if (power[i].menuMethod == 'importExcel') {
+ importExcel = true
+ }
}
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (!del) {
this.itemParameterData.do.splice(1, 1)
}
@@ -542,7 +636,9 @@
}
}
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'
--
Gitblit v1.9.3