From a6c14c75e5a5f677c2a3571cad426d50cb106e3d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 09 八月 2024 09:02:59 +0800
Subject: [PATCH] 修改检验任务、下单bug
---
src/components/tool/value-table.vue | 126 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 45 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index cf0b8b7..200cd41 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -52,6 +52,9 @@
.red{
color: red !important;
}
+ >>>.el-loading-parent--relative {
+ z-index: 1 !important;
+ }
</style>
<style>
/* .value-table .highlight-warning-row-border td {
@@ -104,6 +107,7 @@
display: inline-block;
margin-left: 200px;
}
+
</style>
<template>
@@ -119,18 +123,18 @@
</el-table-column>
<el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
- <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
- v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
+ <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :isShowZero="isShowZero"
+ v-for="(a, ai) in tableHead" :key="ai+'bbbbb'" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
<template v-if="typeof(scope.row[a.label]) == 'object'">
<template v-for="(param, i) in scope.row[a.label]">
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == param"
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'cccc'" v-if="b.value == param"
:type="b.type" size="medium" style="margin-right: 5px;">{{b.label}}</el-tag>
</template>
</template>
<template v-else>
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'ddddd'" v-show="b.value == scope.row[a.label]"
:type="b.type" size="medium">{{b.label}}</el-tag>
</template>
</div>
@@ -144,7 +148,8 @@
</el-table-column>
<el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()" v-if="data.do.length > 0">
<template slot-scope="scope">
- <el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type"
+ <el-button v-for="(a, ai) in data.do" :key="ai
+ +'qqqq'" :type="a.type"
:disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" @click="main(scope.row, a)"
class="handleBtn">
<span v-if="a.type!='upload'">{{a.font}}</span>
@@ -168,7 +173,7 @@
<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
<div class="body" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
<div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <div v-for="(a, ai) in upHead" :key="ai+'ffff'" style="line-height: 50px;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1">
<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
</el-col>
@@ -179,7 +184,7 @@
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'eeeee'" :value="b.value"
:label="b.label">
</el-option>
</el-select>
@@ -200,7 +205,7 @@
</div>
</div>
<div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <el-row v-for="(a, ai) in upHead" :key="ai+'ggggg'" style="line-height: 50px;">
<el-col :span="6" style="text-align: right;">
<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
</el-col>
@@ -211,7 +216,7 @@
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'fffff'" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)" :multiple="false"
@@ -237,7 +242,7 @@
<el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
<div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
<div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <div v-for="(a, ai) in upHead" :key="ai+'yyyyy'" style="line-height: 50px;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1"><span class="required-span"
v-if="showAddReq(a.label)">*
</span>{{a.value}}锛�</el-col>
@@ -247,7 +252,7 @@
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
:multiple="data.selectField[a.label].choose"
style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'hhhh'" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
@@ -266,7 +271,7 @@
</div>
</div>
<div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <el-row v-for="(a, ai) in upHead" :key="ai+'jjjjj'" style="line-height: 50px;">
<el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">*
</span>{{a.value}}锛�</el-col>
<el-col :span="16" :offset="1">
@@ -275,7 +280,7 @@
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
:multiple="data.selectField[a.label].choose"
style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'mmmmmm'" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
@@ -344,6 +349,10 @@
default: () => '155'
},
isColumnWidth: {
+ type: Boolean,
+ default: () => false
+ },
+ isShowZero: {
type: Boolean,
default: () => false
},
@@ -586,8 +595,8 @@
this.selectList('page')
},
selectList(val) {
- console.log('val---', val)
- console.log('this.page---', this.page)
+ // console.log('val---', val)
+ // console.log('this.page---', this.page)
this.loading = true
if(val===undefined){
this.page.current = 1;
@@ -616,26 +625,49 @@
this.total = res.data.body.total
this.tableHead = res.data.head
this.tableData = res.data.body.records
+ if (this.data.needSort !== undefined) {
+ for (var i = 0; i < this.data.needSort.length; i++) {
+ this.tableHead.forEach(item => {
+ if (item.label === this.data.needSort[i]) {
+ item.sort = 'custom'
+ }
+ })
+ }
+ }
+ if (this.isShowZero) {
+ this.tableData.map(item => {
+ Object.keys(item).forEach(val => {
+ if (item[val] === null && (val.includes('Hours') || val === 'total')) {
+ item[val] = 0
+ }
+ })
+ })
+ }
if (this.tableData.length === 0 && this.page.current > 1) {
this.selectList('lastPage')
}
- if (this.isColumnWidth) {
- this.tableHead.forEach(item => {
- if (item.value.length === 4) {
- item.width = 120
- } else if (item.value.length === 3){
- item.width = 100
- } else if (item.value.length === 5){
- item.width = 130
- } else if (item.value.length === 7){
- item.width = 160
- } else if (item.value.length === 6){
- item.width = 150
- } else {
- item.width = 86
- }
- })
- }
+ // if (this.isColumnWidth) {
+ // this.tableHead.forEach(item => {
+ // if(!item.width){
+ // if (item.value.length === 4) {
+ // item.width = 120
+ // } else if (item.value.length === 3){
+ // item.width = item.label.includes('Hours') ? 50 : 100
+ // } else if (item.value.length === 5){
+ // item.width = 130
+ // } else if (item.value.length === 7){
+ // item.width = 160
+ // } else if (item.value.length === 6){
+ // item.width = 150
+ // } else if (item.value.length === 2){
+ // item.width = item.label.includes('Hours') ? 52 : 86
+ // } else {
+ // item.width = item.label.includes('Hours') ? 46 : 86
+ // }
+ // }
+ // })
+ // }
+
// console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
@@ -1134,7 +1166,7 @@
return
}
this.$message.success('鍒犻櫎鎴愬姛')
- this.selectList()
+ this.selectList('page')
}).catch(e => {
this.$message.error('鍒犻櫎澶辫触')
})
@@ -1149,20 +1181,24 @@
const list = JSON.parse(JSON.stringify(this.multipleSelection))
const url = e === 0 ? this.$api.auxiliaryWorkingHoursDay.check : this.$api.auxiliaryWorkingHoursDay.approve
const state = e === 0 ? '宸插鏍�' : '宸叉壒鍑�'
+ let auxiliaryWorkingHoursDays = []
list.forEach(item => {
- this.$axios.post(url, {id: item.id, state: state
- },{
- headers: {
- 'Content-Type': 'application/json'
- }
+ delete item.orderBy
+ item.state = state
+ auxiliaryWorkingHoursDays.push(item)
+ })
+ this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays
+ },{
+ headers: {
+ 'Content-Type': 'application/json'
}
- ).then(res => {
- if (res.code === 201) {
- return
- }
- this.$parent.submitBatchCheckDialog()
- this.$message.success('鎿嶄綔鎴愬姛')
- })
+ }
+ ).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$parent.submitBatchCheckDialog()
+ this.$message.success('鎿嶄綔鎴愬姛')
})
} else {
this.$message.error('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�')
--
Gitblit v1.9.3