From 07506d995a2ecff9decc0b3545caf1052308a228 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 18 三月 2024 15:21:53 +0800
Subject: [PATCH] 功能调整
---
src/components/view/b2-standard.vue | 7 ++++---
src/components/do/b1-ins-order/add.vue | 6 +++++-
src/components/tool/value-table.vue | 2 +-
src/components/view/b1-inspect-order-plan.vue | 1 +
src/components/view/b1-inspection-order.vue | 7 +++++--
src/view/index.vue | 12 ++++++++++--
6 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 063abfc..050fbd9 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -220,7 +220,7 @@
<el-table-column label="鎿嶄綔" width="65" align="center">
<template slot-scope="scope">
{{scope.index}}
- <el-button type="text" size="small" @click="sampleList.splice(scope.$index, 1)" :disabled="active!=1">鍒犻櫎</el-button>
+ <el-button type="text" size="small" @click="delSampleAndProduct" :disabled="active!=1">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -756,6 +756,10 @@
this.sampleList = obj.sampleList;
})
},
+ delSampleAndProduct(){
+ this.sampleList.splice(scope.$index, 1)
+ this.productList = []
+ }
}
}
</script>
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index bd3a83f..78fa5f5 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -76,7 +76,7 @@
</el-table-column>
<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"
+ <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" v-for="(a, ai) in tableHead" :key="ai"
show-overflow-tooltip min-width="160">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index bb8dcaf..def16ef 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -177,6 +177,7 @@
isIndex: true,
showSelect: false,
select: false,
+ sort: false,
do: [{
id: '',
font: '妫�楠�',
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 4ad89cb..ac0a7ca 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -241,7 +241,7 @@
type: 'text',
method: 'download',
disabFun: (row, index) => {
- return row.state != 1
+ return row.state != 1 || row.reportId == null
}
}, {
id: 'verify',
@@ -255,7 +255,10 @@
id: 'quash',
font: '鎾ら攢',
type: 'text',
- method: 'handlEquash'
+ method: 'handlEquash',
+ disabFun: (row, index) => {
+ return row.state == 2 || row.state == 3
+ }
}, {
font: '涓嬪彂',
type: 'text',
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 463a9d3..333deea 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -99,7 +99,7 @@
</el-row>
<el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }"
node-key="label" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current
- @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false" :default-expanded-keys="expandedKeys">
+ @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="true" :default-expanded-keys="expandedKeys">
<div class="custom-tree-node" slot-scope="{ node, data }">
<el-row>
<el-col :span="21">
@@ -465,9 +465,10 @@
this.list = res.data
this.list.forEach(a=>{
a.children.forEach(b=>{
- b.children.forEach(c=>{
+ /* b.children.forEach(c=>{
this.expandedKeys.push(c.label)
- })
+ }) */
+ this.expandedKeys.push(b.label)
})
})
this.treeLoad = false
diff --git a/src/view/index.vue b/src/view/index.vue
index c8ddf1c..04e57ba 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -230,7 +230,7 @@
}
.right_key_menu {
- width: 120px;
+ width: 130px;
position: absolute;
top: 0;
left: 0;
@@ -249,7 +249,7 @@
}
.right_key_menu li i {
- margin-right: 14px;
+ margin-right: 10px;
}
.right_key_menu li:hover {
@@ -329,6 +329,7 @@
<ul>
<li @click="removeTab(activeIndex)"><i class="el-icon-close"></i>鍏抽棴</li>
<li @click="allDel"><i class="el-icon-delete"></i>鍏抽棴鎵�鏈�</li>
+ <li @click="rightDel(activeIndex)"><i class="el-icon-d-arrow-right"></i>鍏抽棴鍙充晶椤电</li>
<el-divider></el-divider>
<li @click="refreshTable"><i class="el-icon-refresh"></i>鍒锋柊</li>
</ul>
@@ -428,6 +429,13 @@
let data = this.tabs[this.tabs.length - 1]
this.upTabActive(data.k)
},
+ rightDel(index){
+ for (var i = this.tabs.length - 1; i > index; i--) {
+ this.tabs.splice(i, 1);
+ }
+ let data = this.tabs[this.tabs.length - 1]
+ this.upTabActive(data.k)
+ },
allDel() {
this.activeBox = 0
this.activeP = 0
--
Gitblit v1.9.3