FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-08-17 17:15:27 +08:00
parent ea4c4a10c5 7a63fc77e1
commit b13990bf22
2 changed files with 108 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+57 -14
View File
@@ -108,7 +108,8 @@
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
@@ -301,6 +302,8 @@
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange" @selection-change="selectListChange"
ref="selection" ref="selection"
> >
@@ -321,7 +324,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a> scope.row.detailedListName
}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -340,7 +344,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -368,6 +373,8 @@
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange" @selection-change="selectListChange"
ref="selection" ref="selection"
> >
@@ -388,7 +395,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a> scope.row.detailedListName
}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -407,7 +415,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -417,7 +426,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
scope.row.applicationScope
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -428,7 +438,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime {{
scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
}} }}
</div> </div>
</template> </template>
@@ -448,6 +459,8 @@
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange" @selection-change="selectListChange"
ref="selection" ref="selection"
> >
@@ -468,7 +481,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a> scope.row.detailedListName
}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -487,7 +501,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -497,7 +512,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
scope.row.applicationScope
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -508,7 +524,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime {{
scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
}} }}
</div> </div>
</template> </template>
@@ -616,7 +633,8 @@
scope.row.standNumber scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }} scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
@@ -1324,8 +1342,6 @@ export default {
this.listForm.inforlist = formId.join(","); this.listForm.inforlist = formId.join(",");
}, e => { }, e => {
}); });
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
} else { } else {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行带入");
} }
@@ -1337,6 +1353,33 @@ export default {
this.selectedList.push(data[0]); this.selectedList.push(data[0]);
} }
}, },
// 表格某一行的单击事件
rowClick(row, column) {
const selectData = this.selectList
this.$refs.selection.clearSelection()
if (selectData.length === 1) {
selectData.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item === row) {
this.$refs.selection.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.selection.toggleRowSelection(row, true);
}
})
} else {
this.$refs.selection.toggleRowSelection(row, true);
}
},
select(selection, row) {
// 清除 所有勾选项
this.$refs.selection.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if (selection.length === 0) return
this.$refs.selection.toggleRowSelection(row, true)
},
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
this.selectList = []; this.selectList = [];
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+34 -2
View File
@@ -302,6 +302,8 @@
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange" @selection-change="selectListChange"
ref="selection" ref="selection"
> >
@@ -371,6 +373,8 @@
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange" @selection-change="selectListChange"
ref="selection" ref="selection"
> >
@@ -440,6 +444,8 @@
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange" @selection-change="selectListChange"
ref="selection" ref="selection"
> >
@@ -1301,8 +1307,6 @@ export default {
this.listForm.inforlist = formId.join(","); this.listForm.inforlist = formId.join(",");
}, e => { }, e => {
}); });
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
} else { } else {
this.$message.warning("请选择一条数据进行带入"); this.$message.warning("请选择一条数据进行带入");
} }
@@ -1321,10 +1325,38 @@ export default {
this.selectList.push(data[i].id); this.selectList.push(data[i].id);
} }
}, },
select(selection, row) {
// 清除 所有勾选项
this.$refs.selection.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if(selection.length === 0) return
this.$refs.selection.toggleRowSelection(row, true)
},
//添加标准select的改变 //添加标准select的改变
selectThree(data) { selectThree(data) {
this.standList = data; this.standList = data;
}, },
// 表格某一行的单击事件
rowClick(row, column) {
const selectData = this.selectList
this.$refs.selection.clearSelection()
if( selectData.length === 1 ) {
selectData.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item === row) {
this.$refs.selection.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.selection.toggleRowSelection(row, true);
}
})
}
else {
this.$refs.selection.toggleRowSelection(row, true);
}
},
choiceZRR(type, title, id) { choiceZRR(type, title, id) {
this.nodeList = []; this.nodeList = [];
this.nodeList.push(id); this.nodeList.push(id);