diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 675a385..5ede013 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -47,9 +47,9 @@
-
+
-
+
@@ -61,7 +61,7 @@
查询
- 新增
+ 新增
{{ '导出' }}
搜索
- 流程关闭
+ 流程关闭
@@ -94,6 +94,7 @@
v-loading="dataListLoading"
style="width: 100%; ">
-
-
-
-
- 修改
-
-
+
详情
-
- 删除
-
-
-
- 下达
-
+
+
+
+
+
+ 修改
+
+
+ 详情
+
+
+ 删除
+
+
+
+ 下达
+
+
+
+
+ 更多
+
+
+ Dead
+ Re-Sample
+ 归档
+ 拷贝
+
+
-
-
- 更多
-
-
- Dead
- Re-Sample
- 归档
- 拷贝
-
-
@@ -598,6 +604,12 @@
AddOrUpdate,
BuSelect,
},
+ props: {
+ queryOnly: {
+ type: Boolean,
+ default: false
+ }
+ },
data() {
return {
approvalList: [],
@@ -639,7 +651,8 @@
sp: '',
nodeId: '',
documentSource: '',
- menuId: this.$route.meta.menuId
+ menuId: this.queryOnly ? '103002' : this.$route.meta.menuId,
+ excludeStatusList: []
},
nodeOptions: [],
pageIndex: 1,
@@ -1103,6 +1116,7 @@
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
codeNo:this.$route.params.docNo,
+ excludeStatusList: this.buildExcludeStatusList()
}
technicalSpecificationListSearch(inData).then(({data}) => {
if (data.code == 0) {
@@ -1146,6 +1160,14 @@
}
},
methods: {
+ buildExcludeStatusList () {
+ return this.queryOnly ? ['death', 'dead'] : []
+ },
+
+ applyQueryOnlyFilter (target) {
+ target.excludeStatusList = this.buildExcludeStatusList()
+ },
+
selectionChangeMainHandle(val) {
this.mainTableSelections = val
},
@@ -1244,6 +1266,7 @@
search () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
+ this.applyQueryOnlyFilter(this.searchData)
this.dataListLoading = true;
technicalSpecificationListSearch(this.searchData).then(({data}) => {
if (data && data.code === 0) {
@@ -1430,6 +1453,7 @@
limit: this.totalPage || 99999,
page: 1
})
+ this.applyQueryOnlyFilter(exportParams)
await technicalSpecificationListSearch(exportParams).then(({data}) => {
this.exportList = data.page.list;
})
@@ -1629,6 +1653,7 @@
params.site = this.$store.state.user.site
params.userName = this.$store.state.user.name
params.userId = this.$store.state.user.id.toString()
+ params.excludeStatusList = this.buildExcludeStatusList()
this.dataListLoading = true;
technicalSpecificationListSearchByAnyField(params).then(({data})=>{
if (data && data.code === 0){
diff --git a/src/views/modules/sampleManagement/technicalSpecificationQuery.vue b/src/views/modules/sampleManagement/technicalSpecificationQuery.vue
new file mode 100644
index 0000000..fb3d981
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationQuery.vue
@@ -0,0 +1,14 @@
+
+
+
+
+