diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 05b9cd0bd..9b78fcabf 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -260,7 +260,7 @@ { title: '标准化活动日历', path: '/standCalendar', - menuId: '' + menuId: '5e834b3fca90619e593ad0ee83263885' }, // { // title: '标准比对库', diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue index 5e0fa37d1..501ebe237 100644 --- a/src/pages/config/pages/linkManage/linkType/firstLink.vue +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -7,7 +7,7 @@ type="primary" class="common-button-primary add-button" @click="addLink" - v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'" + v-btn-permission="'a87f58f50bed49452ee2a9147254b16b'" size="mini">新增 - 属性 - 编辑 - 编辑 - 复制 - 删除 + 属性 + 编辑 + 编辑 + 复制 + 删除 diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue index b8a4545bd..9b7575534 100644 --- a/src/pages/localTool/standContrast/index.vue +++ b/src/pages/localTool/standContrast/index.vue @@ -19,12 +19,12 @@ type="primary" size="mini" class="common-button-primary" - v-btn-permission="''" + v-btn-permission="'91e02de33d955a8df791366636803570'" @click="sarStandCompareHisInfo">搜索 清空 diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue index 45473ea90..069dfec29 100644 --- a/src/pages/localTool/standContrast/pages/contrastDetails.vue +++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue @@ -17,11 +17,12 @@ 搜索 - 清空 + 清1空 @@ -105,11 +106,12 @@ 搜索 - 清空 + 清空 @@ -184,8 +186,8 @@
- {{$t('m.termComparison')}} - {{$t('m.fullTextComparison')}} + {{$t('m.termComparison')}} + {{$t('m.fullTextComparison')}}
数据加载中…… diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 5e53efff1..39414f851 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -134,6 +134,7 @@ style="margin: 6px 8px 0 0" type="primary" size="mini" + v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'" @click="searchBtnClick" class="common-button-primary"> 查询 @@ -141,6 +142,7 @@ 清空 @@ -150,7 +152,9 @@
- 导出Excel + 导出Excel
@@ -237,6 +241,7 @@ 取消预警 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 69b9e7373..2fd3e28bc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -1064,11 +1064,15 @@ export default { this.projectList = data; }, choiceZRR(scope, type, title, id) { - console.log(scope); if (scope != null) { this.currentIndex = scope.$index; this.nodeList = []; - this.nodeList.push(scope.row.distributePersonId); + if(type === 'distributePerson'){ + this.nodeList.push(scope.row.distributePersonId); + }else{ + this.nodeList.push( scope.row.projectGroupPeopleId) + } + }else{ this.nodeList = []; this.nodeList.push(id); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index d84cd2b92..877f9745c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -620,10 +620,6 @@ export default { noCompliance: "", //在研不合规项目 countermeasures: "", //在研应对措施 completionTime: "", //在研完成时间 - zcComplianceReasons: "", //在产的合规原因 - zcNoCompliance: "", //在产不合规项目 - zcCountermeasures: "", //在产的应对措施 - zcCompletionTime: "" //在产的完成时间 }] }, choiceForm: {}, //选择标准清单列表 @@ -814,7 +810,7 @@ export default { }, handlePrice(){ for (let i = 0; i < this.dataList.length; i++) { - if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ + if (this.dataList[i].complianceReasons|| (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ }else { this.comFlag ++ } @@ -847,6 +843,8 @@ export default { this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); this.isSubmit = true + console.log('可以提交'); + return this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue index b04525431..fe8b4420b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue @@ -9,8 +9,8 @@ diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue new file mode 100644 index 000000000..ab57da038 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue @@ -0,0 +1,891 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue new file mode 100644 index 000000000..36fa47d76 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue @@ -0,0 +1,826 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/step2.vue b/src/pages/processCenter/pages/phone/qbfs/step2.vue deleted file mode 100644 index 681239939..000000000 --- a/src/pages/processCenter/pages/phone/qbfs/step2.vue +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/phone/qbfs/step4.vue b/src/pages/processCenter/pages/phone/qbfs/step4.vue deleted file mode 100644 index bdf95231d..000000000 --- a/src/pages/processCenter/pages/phone/qbfs/step4.vue +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue new file mode 100644 index 000000000..9b663b732 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -0,0 +1,844 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 305570678..e272a696b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -39,10 +39,12 @@ type="primary" class="common-button-primary" size="mini" + v-btn-permission="'2c8041eb6226368ee6e6b975b4aa88f1'" @click="selectProcessBtn">查询 清空
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 135be39c7..978382242 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -39,10 +39,12 @@ type="primary" class="common-button-primary" size="mini" + v-btn-permission="'253fb387b97868c10434cc8fa3d87294'" @click="selectProcessBtn">查询
清空 diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 0955129cd..d81eadf51 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -39,10 +39,12 @@ type="primary" class="common-button-primary" size="mini" + v-btn-permission="'68d17445a13ff3f635c39291070985c3'" @click="selectProcessBtn">查询 清空 @@ -125,7 +127,7 @@ - 查看 + 查看 diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 8bb6a98e9..3e861aab2 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -190,7 +190,7 @@

企业标准相关流程

- +
@@ -205,7 +205,7 @@
- +
@@ -265,7 +265,7 @@
- +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 7520b3541..ae04ce5e7 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -39,10 +39,12 @@ type="primary" class="common-button-primary" size="mini" + v-btn-permission="'5eb720bb99553de7ae77a977a6276d7c'" @click="selectProcessBtn">查询 清空
@@ -131,8 +133,8 @@ - 办理 - 转办 + 办理 + 转办
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 0ab70c38d..ca22adafe 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -39,12 +39,17 @@ type="primary" class="common-button-primary" size="mini" + v-btn-permission="'255351d90836fad911d347da0e8c65b5'" @click="selectProcessBtn">查询 清空 - 删除 + 删除
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 2762bd95d..4f84584d3 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -2418,7 +2418,7 @@ // 树节点鼠标移入移出 mouseenter(data){ this.$set(data, 'show', true) - if(data.parentId !== null){ + if(data.parentId !== null && data.id !== 'zcwdsc'){ this.$set(data, 'showDel', true) } }, diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 26cec42cd..b14655ab7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -191,7 +191,7 @@
符合
-
不涉及
+
不涉及
不符合
diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index 2b3dfc28d..9bc0ef834 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -2,11 +2,11 @@