From b6a18d0441c2d5b35faba8c0f504cbcb239a1ddb Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期三, 13 三月 2024 10:07:42 +0800
Subject: [PATCH] 检验下单 功能调整
---
src/components/tool/value-table.vue | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 648a160..829f513 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -31,7 +31,7 @@
justify-content: center;
}
- .body{
+ .body {
overflow-x: hidden;
}
</style>
@@ -51,10 +51,10 @@
<el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border
@selection-change="selectChange" @select="select" v-loading="loading" @sort-change="sortChange"
@row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
- :summary-method="getSummaries">
- <el-table-column type="selection" width="65" v-if="data.showSelect">
+ :summary-method="getSummaries" :key="Math.random()">
+ <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
</el-table-column>
- <el-table-column align="center" type="index" label="搴忓彿" width="70" v-if="data.isIndex">
+ <el-table-column type="index" align="center" label="搴忓彿" width="70" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
<el-table-column :prop="a.label" :label="a.value" sortable="custom" v-for="(a, ai) in tableHead" :key="ai"
show-overflow-tooltip min-width="160">
@@ -63,10 +63,12 @@
<el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
:type="b.type" size="medium">{{b.label}}</el-tag>
</div>
+ <!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
+ <span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;" @click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
<span v-else>{{scope.row[a.label]}}</span>
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" :width="50 + data.do.length * 30"
+ <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"
@@ -92,7 +94,7 @@
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :disabled="isDisabled(a.label)">
+ style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
@@ -108,7 +110,7 @@
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :disabled="isDisabled(a.label)">
+ style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
@@ -132,7 +134,7 @@
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
v-if="showType(a.label, data.selectField) == null"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`">
+ style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
@@ -147,7 +149,7 @@
<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
v-if="showType(a.label, data.selectField) == null"></el-input>
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
- style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`">
+ style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
:label="b.label"></el-option>
</el-select>
@@ -223,8 +225,8 @@
order: 'asc'
}
},
- isIndex: true,
- showSelect: true,
+ isIndex: false,
+ showSelect: false,
select: true,
row: 1,
do: [{
@@ -264,8 +266,8 @@
order: 'asc'
}
},
- isIndex: true,
- showSelect: true,
+ isIndex: false,
+ showSelect: false,
select: true,
row: 1,
do: [{
@@ -388,6 +390,10 @@
var str = ob[val]
return str == undefined ? null : ob[val].select
},
+ showLink(val, ob){
+ var str = ob[val]
+ return str == undefined ? null : ob[val].method
+ },
showAddReq(label) {
if (this.data.requiredAdd == undefined) {
return
@@ -465,7 +471,8 @@
}
} else {
delete row.orderBy
- this.$emit(val.method, row)
+ this.$parent[val.method](row)
+ // this.$emit(val.method, row)
}
},
saveUpData() {
@@ -504,7 +511,6 @@
})
},
openAddDia(addUrl) {
- console.log(addUrl);
this.addDia = true
this.addUrl = addUrl
this.upData = {}
@@ -698,6 +704,20 @@
}
});
return sums;
+ },
+ handleLinkEvent(row,val){
+ if(val.method=='doDiy'){
+ this.main(row,val)
+ }else{
+ this.$emit(val.method,row)
+ }
+ },
+ getWidth(){
+ let count = 0
+ this.data.do.forEach(a=>{
+ count += a.font.length
+ })
+ return count * 15 + 60 + 'px'
}
}
}
--
Gitblit v1.9.3