diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue index cd5934b..b91fbc8 100644 --- a/src/views/resource/file/methodConfirm/detail.vue +++ b/src/views/resource/file/methodConfirm/detail.vue @@ -614,7 +614,10 @@ - + @@ -730,7 +733,7 @@ - +
- +
+ + diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue index cd5934b..b91fbc8 100644 --- a/src/views/resource/file/methodConfirm/detail.vue +++ b/src/views/resource/file/methodConfirm/detail.vue @@ -614,7 +614,10 @@ - + @@ -730,7 +733,7 @@ - +
- +
+ + diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue index afa1636..914d41e 100644 --- a/src/views/resource/file/methodConfirm/list.vue +++ b/src/views/resource/file/methodConfirm/list.vue @@ -389,9 +389,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue index cd5934b..b91fbc8 100644 --- a/src/views/resource/file/methodConfirm/detail.vue +++ b/src/views/resource/file/methodConfirm/detail.vue @@ -614,7 +614,10 @@ - + @@ -730,7 +733,7 @@ - +
- +
+ + diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue index afa1636..914d41e 100644 --- a/src/views/resource/file/methodConfirm/list.vue +++ b/src/views/resource/file/methodConfirm/list.vue @@ -389,9 +389,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue index 70f2868..bd60a37 100644 --- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue +++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue @@ -117,6 +117,10 @@ } // const searchRight = () => { + if (!listQueryRight.value.noveltyStatus) { + methodsList.value = methodsAllList.value + return + } methodsList.value = methodsAllList.value.filter((item: any) => item.noveltyStatus === listQueryRight.value.noveltyStatus) } // 数据查询 diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue index cd5934b..b91fbc8 100644 --- a/src/views/resource/file/methodConfirm/detail.vue +++ b/src/views/resource/file/methodConfirm/detail.vue @@ -614,7 +614,10 @@ - + @@ -730,7 +733,7 @@ - +
- +
+ + diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue index afa1636..914d41e 100644 --- a/src/views/resource/file/methodConfirm/list.vue +++ b/src/views/resource/file/methodConfirm/list.vue @@ -389,9 +389,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue index 70f2868..bd60a37 100644 --- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue +++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue @@ -117,6 +117,10 @@ } // const searchRight = () => { + if (!listQueryRight.value.noveltyStatus) { + methodsList.value = methodsAllList.value + return + } methodsList.value = methodsAllList.value.filter((item: any) => item.noveltyStatus === listQueryRight.value.noveltyStatus) } // 数据查询 diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue index 4ba03bd..c8f158a 100644 --- a/src/views/resource/file/noveltySearch/detail.vue +++ b/src/views/resource/file/noveltySearch/detail.vue @@ -524,7 +524,8 @@ // 填充实验室部门 novelty.value.labCode = userInfo.bizLabCode novelty.value.groupCode = userInfo.groupNo - userInfo.groupNo + console.log(userInfo, 'userInfo') + // 填充查新纪录 getFileMethodList({ offset: 1, @@ -756,7 +757,6 @@ obj.systemFileComplete = '1' obj.systemFileCompleteDate = time } - console.log(currentRecord.value, 'currentRecord.value') setProsessShowBench(obj).then((res) => { if (res.code === 200) { ElMessage.success('操作成功') @@ -827,9 +827,9 @@ - + @@ -842,9 +842,9 @@ - + @@ -979,25 +979,25 @@
创建方法确认登记表 创建文件发放通知单 创建培训签到表 编辑完成 diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue index cd5934b..b91fbc8 100644 --- a/src/views/resource/file/methodConfirm/detail.vue +++ b/src/views/resource/file/methodConfirm/detail.vue @@ -614,7 +614,10 @@ - + @@ -730,7 +733,7 @@ - +
- +
+ + diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue index afa1636..914d41e 100644 --- a/src/views/resource/file/methodConfirm/list.vue +++ b/src/views/resource/file/methodConfirm/list.vue @@ -389,9 +389,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue index 70f2868..bd60a37 100644 --- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue +++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue @@ -117,6 +117,10 @@ } // const searchRight = () => { + if (!listQueryRight.value.noveltyStatus) { + methodsList.value = methodsAllList.value + return + } methodsList.value = methodsAllList.value.filter((item: any) => item.noveltyStatus === listQueryRight.value.noveltyStatus) } // 数据查询 diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue index 4ba03bd..c8f158a 100644 --- a/src/views/resource/file/noveltySearch/detail.vue +++ b/src/views/resource/file/noveltySearch/detail.vue @@ -524,7 +524,8 @@ // 填充实验室部门 novelty.value.labCode = userInfo.bizLabCode novelty.value.groupCode = userInfo.groupNo - userInfo.groupNo + console.log(userInfo, 'userInfo') + // 填充查新纪录 getFileMethodList({ offset: 1, @@ -756,7 +757,6 @@ obj.systemFileComplete = '1' obj.systemFileCompleteDate = time } - console.log(currentRecord.value, 'currentRecord.value') setProsessShowBench(obj).then((res) => { if (res.code === 200) { ElMessage.success('操作成功') @@ -827,9 +827,9 @@ - + @@ -842,9 +842,9 @@ - + @@ -979,25 +979,25 @@
创建方法确认登记表 创建文件发放通知单 创建培训签到表 编辑完成 diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue index 1c9f87f..7bdaa1a 100644 --- a/src/views/resource/file/noveltySearch/list.vue +++ b/src/views/resource/file/noveltySearch/list.vue @@ -32,7 +32,7 @@ const apprDial = ref() // 查询条件 -const searchQuery = ref({ +const searchQuery = ref({ groupCode: '', labCode: '', formNo: '', // 登记表编号 @@ -407,9 +407,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue index cd5934b..b91fbc8 100644 --- a/src/views/resource/file/methodConfirm/detail.vue +++ b/src/views/resource/file/methodConfirm/detail.vue @@ -614,7 +614,10 @@ - + @@ -730,7 +733,7 @@ - +
- +
+ + diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue index afa1636..914d41e 100644 --- a/src/views/resource/file/methodConfirm/list.vue +++ b/src/views/resource/file/methodConfirm/list.vue @@ -389,9 +389,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue index 70f2868..bd60a37 100644 --- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue +++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue @@ -117,6 +117,10 @@ } // const searchRight = () => { + if (!listQueryRight.value.noveltyStatus) { + methodsList.value = methodsAllList.value + return + } methodsList.value = methodsAllList.value.filter((item: any) => item.noveltyStatus === listQueryRight.value.noveltyStatus) } // 数据查询 diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue index 4ba03bd..c8f158a 100644 --- a/src/views/resource/file/noveltySearch/detail.vue +++ b/src/views/resource/file/noveltySearch/detail.vue @@ -524,7 +524,8 @@ // 填充实验室部门 novelty.value.labCode = userInfo.bizLabCode novelty.value.groupCode = userInfo.groupNo - userInfo.groupNo + console.log(userInfo, 'userInfo') + // 填充查新纪录 getFileMethodList({ offset: 1, @@ -756,7 +757,6 @@ obj.systemFileComplete = '1' obj.systemFileCompleteDate = time } - console.log(currentRecord.value, 'currentRecord.value') setProsessShowBench(obj).then((res) => { if (res.code === 200) { ElMessage.success('操作成功') @@ -827,9 +827,9 @@ - + @@ -842,9 +842,9 @@ - + @@ -979,25 +979,25 @@
创建方法确认登记表 创建文件发放通知单 创建培训签到表 编辑完成 diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue index 1c9f87f..7bdaa1a 100644 --- a/src/views/resource/file/noveltySearch/list.vue +++ b/src/views/resource/file/noveltySearch/list.vue @@ -32,7 +32,7 @@ const apprDial = ref() // 查询条件 -const searchQuery = ref({ +const searchQuery = ref({ groupCode: '', labCode: '', formNo: '', // 登记表编号 @@ -407,9 +407,9 @@ - + diff --git a/src/views/resource/technology/method/detail.vue b/src/views/resource/technology/method/detail.vue index b67ce56..1780bd1 100644 --- a/src/views/resource/technology/method/detail.vue +++ b/src/views/resource/technology/method/detail.vue @@ -340,11 +340,16 @@ initDict() initDialog(route.query) }) + +defineExpose({ + initDialog, + methodFileInfo, +}) + + diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue index afa1636..914d41e 100644 --- a/src/views/resource/file/methodConfirm/list.vue +++ b/src/views/resource/file/methodConfirm/list.vue @@ -389,9 +389,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue index 70f2868..bd60a37 100644 --- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue +++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue @@ -117,6 +117,10 @@ } // const searchRight = () => { + if (!listQueryRight.value.noveltyStatus) { + methodsList.value = methodsAllList.value + return + } methodsList.value = methodsAllList.value.filter((item: any) => item.noveltyStatus === listQueryRight.value.noveltyStatus) } // 数据查询 diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue index 4ba03bd..c8f158a 100644 --- a/src/views/resource/file/noveltySearch/detail.vue +++ b/src/views/resource/file/noveltySearch/detail.vue @@ -524,7 +524,8 @@ // 填充实验室部门 novelty.value.labCode = userInfo.bizLabCode novelty.value.groupCode = userInfo.groupNo - userInfo.groupNo + console.log(userInfo, 'userInfo') + // 填充查新纪录 getFileMethodList({ offset: 1, @@ -756,7 +757,6 @@ obj.systemFileComplete = '1' obj.systemFileCompleteDate = time } - console.log(currentRecord.value, 'currentRecord.value') setProsessShowBench(obj).then((res) => { if (res.code === 200) { ElMessage.success('操作成功') @@ -827,9 +827,9 @@ - + @@ -842,9 +842,9 @@ - + @@ -979,25 +979,25 @@
创建方法确认登记表 创建文件发放通知单 创建培训签到表 编辑完成 diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue index 1c9f87f..7bdaa1a 100644 --- a/src/views/resource/file/noveltySearch/list.vue +++ b/src/views/resource/file/noveltySearch/list.vue @@ -32,7 +32,7 @@ const apprDial = ref() // 查询条件 -const searchQuery = ref({ +const searchQuery = ref({ groupCode: '', labCode: '', formNo: '', // 登记表编号 @@ -407,9 +407,9 @@ - + diff --git a/src/views/resource/technology/method/detail.vue b/src/views/resource/technology/method/detail.vue index b67ce56..1780bd1 100644 --- a/src/views/resource/technology/method/detail.vue +++ b/src/views/resource/technology/method/detail.vue @@ -340,11 +340,16 @@ initDict() initDialog(route.query) }) + +defineExpose({ + initDialog, + methodFileInfo, +}) + + diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue index afa1636..914d41e 100644 --- a/src/views/resource/file/methodConfirm/list.vue +++ b/src/views/resource/file/methodConfirm/list.vue @@ -389,9 +389,9 @@ - + diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue index 70f2868..bd60a37 100644 --- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue +++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue @@ -117,6 +117,10 @@ } // const searchRight = () => { + if (!listQueryRight.value.noveltyStatus) { + methodsList.value = methodsAllList.value + return + } methodsList.value = methodsAllList.value.filter((item: any) => item.noveltyStatus === listQueryRight.value.noveltyStatus) } // 数据查询 diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue index 4ba03bd..c8f158a 100644 --- a/src/views/resource/file/noveltySearch/detail.vue +++ b/src/views/resource/file/noveltySearch/detail.vue @@ -524,7 +524,8 @@ // 填充实验室部门 novelty.value.labCode = userInfo.bizLabCode novelty.value.groupCode = userInfo.groupNo - userInfo.groupNo + console.log(userInfo, 'userInfo') + // 填充查新纪录 getFileMethodList({ offset: 1, @@ -756,7 +757,6 @@ obj.systemFileComplete = '1' obj.systemFileCompleteDate = time } - console.log(currentRecord.value, 'currentRecord.value') setProsessShowBench(obj).then((res) => { if (res.code === 200) { ElMessage.success('操作成功') @@ -827,9 +827,9 @@ - + @@ -842,9 +842,9 @@ - + @@ -979,25 +979,25 @@
创建方法确认登记表 创建文件发放通知单 创建培训签到表 编辑完成 diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue index 1c9f87f..7bdaa1a 100644 --- a/src/views/resource/file/noveltySearch/list.vue +++ b/src/views/resource/file/noveltySearch/list.vue @@ -32,7 +32,7 @@ const apprDial = ref() // 查询条件 -const searchQuery = ref({ +const searchQuery = ref({ groupCode: '', labCode: '', formNo: '', // 登记表编号 @@ -407,9 +407,9 @@ - + diff --git a/src/views/resource/technology/method/detail.vue b/src/views/resource/technology/method/detail.vue index b67ce56..1780bd1 100644 --- a/src/views/resource/technology/method/detail.vue +++ b/src/views/resource/technology/method/detail.vue @@ -340,11 +340,16 @@ initDict() initDialog(route.query) }) + +defineExpose({ + initDialog, + methodFileInfo, +})