From 760d1a1f815d349832a36fac25b28abb51ff53d4 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 25 九月 2024 17:20:35 +0800
Subject: [PATCH] 1.检验任务提交之后的弹框,填写 试验信息只有在电路试验的站点才会进行填写,其余站点不需要
---
src/components/do/b3-work-time-management/work-time-statistics.vue | 115 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 710d6f7..29a8650 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -44,21 +44,24 @@
<el-button size="small" type="primary" @click="handleUp" v-show="currentTable == 'value1'&&up">瀵� 鍏�</el-button>
</div>
</div>
- <el-radio-group v-model="currentTable" size="small" :key="'111'" style="margin-top: 10px;">
- <el-radio-button label="value0">
- 鍘熷宸ユ椂
- </el-radio-button>
- <el-radio-button label="value1">
- 淇宸ユ椂
- </el-radio-button>
- </el-radio-group>
+ <div style="text-align: left">
+ <el-radio-group v-model="currentTable" size="small" :key="'111'" style="margin-top: 10px;">
+ <el-radio-button label="value0">
+ 鍘熷宸ユ椂
+ </el-radio-button>
+ <el-radio-button label="value1">
+ 淇宸ユ椂
+ </el-radio-button>
+ </el-radio-group>
+ </div>
<div class="table">
<ValueTable ref="ValueTable0"
- v-if="currentTable == 'value0'"
+ v-if="currentTable == 'value0'" :isColumnWidth="true"
+ :isShowZero="true"
:url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
:componentData="componentData" :key="upIndex" />
- <ValueTable ref="ValueTable1"
- v-if="currentTable == 'value1'"
+ <ValueTable ref="ValueTable1" :isShowZero="true"
+ v-if="currentTable == 'value1'" :isColumnWidth="true"
:url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
:inputUrl="$api.auxiliaryCorrectionHours.upload"
:componentData="componentData0"
@@ -81,51 +84,53 @@
down:false,
up:false,
componentData: {
- entity: {
- month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
- name: null,
- departLims: null,
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [],
- tagField: {},
- linkEvent: {},
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- accept:聽'.xlsx',
- inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- cellSpecialStyle:{
- redColorByKey:'Hours'
- }
+ entity: {
+ month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
+ name: null,
+ departLims: null,
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {},
+ linkEvent: {},
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: [],
+ accept:聽'.xlsx',
+ inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ cellSpecialStyle:{
+ redColorByKey:'Hours'
+ },
},
componentData0: {
- entity: {
- month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
- name: null,
- departLims: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [],
- tagField: {},
- linkEvent: {
- },
- selectField: {},
- requiredAdd: [],
- requiredUp: [],
- accept:聽'.xlsx',
- inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+ entity: {
+ month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
+ name: null,
+ departLims: null,
+ orderBy: {
+ field: 'id',
+ order: 'desc'
+ }
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {},
+ linkEvent: {
+ },
+ selectField: {},
+ requiredAdd: [],
+ requiredUp: [],
+ accept:聽'.xlsx',
+ inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
entity:{
- month:getYearAndMonthAndDays()
+ month:getYearAndMonthAndDays(),
+ name:'',
+ departLims:''
},
entityCopy:{},
entityCopy0:{},
@@ -194,13 +199,13 @@
let entity = {...this.entity}
entity.month = entity.month.split('-')[0]+'-'+entity.month.split('-')[1]
this.outLoading = true
- this.$axios.get(this.$api.auxiliaryOriginalHours.exportOriginalHours,{
- params:entity,
+ this.$axios.post(this.$api.auxiliaryOriginalHours.exportOriginalHours,{
+ ...entity
+ // params:entity,
},{responseType: "blob"}).then(res => {
this.outLoading = false
this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res],{ type: 'application/octet-stream' });
- console.log(blob)
const url = URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
--
Gitblit v1.9.3