diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index dab85f964..0d956b6d5 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -18,15 +18,16 @@
type="primary"
class="common-button-primary"
size="mini"
- v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
@click="selectStandardBtn">
查询
+
清空
+
+
@@ -63,7 +64,8 @@
创建时间:{{getDate(item.creationTime)}}
- 取消收藏
+
+ 取消收藏
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index 5e65ecf6a..e9a6301d8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -235,7 +235,8 @@
0"
disabled
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
@@ -263,7 +264,8 @@
label="不合规项目">
+
+
+
+
+
+
+
+
@@ -456,7 +486,8 @@
0"
disabled
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
@@ -472,7 +503,8 @@
+
+
+
+
+
+
@@ -573,6 +626,8 @@ export default {
noCompliance: "",
// 应对措施
countermeasures: "",
+ // 不涉及理由
+ noInvolve: "",
// 完成时间
completionTime: "",
},
@@ -620,6 +675,8 @@ export default {
complianceReasons: "", //在研合规原因
noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施
+ // 不涉及理由
+ noInvolve: "",
completionTime: "", //在研完成时间
}]
},
@@ -818,6 +875,9 @@ export default {
if(item.complianceReasons){
this.comFlag = 0;
return
+ }else if (item.noInvolve){
+ this.comFlag = 0;
+ return
}else{
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
@@ -834,7 +894,7 @@ export default {
handleSubmit() {
let submitFlag = 0;
this.dataList.forEach(item => {
- if(item.complianceReasons || item.noCompliance){
+ if(item.complianceReasons || item.noCompliance || item.noInvolve){
submitFlag = 1
}
return
@@ -905,6 +965,8 @@ export default {
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
+ //不涉及理由
+ item.noInvolve = this.batchEditForm.noInvolve;
}
});
});
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
index 7d7f12485..0c8193924 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
@@ -251,6 +251,12 @@
+
+
+
+
+
+