diff --git a/projectinformationvue/package.json b/projectinformationvue/package.json index c36c8bc..94c00e7 100644 --- a/projectinformationvue/package.json +++ b/projectinformationvue/package.json @@ -16,6 +16,7 @@ "@toast-ui/editor": "^2.1.2", "ant-design-vue": "^1.7.2", "axios": "^0.18.0", + "cache-loader": "^4.1.0", "china-area-data": "^5.0.1", "clipboard": "^2.0.4", "codemirror": "^5.46.0", diff --git a/projectinformationvue/src/views/projectstart/modules/BusPlanPrint.vue b/projectinformationvue/src/views/projectstart/modules/BusPlanPrint.vue index 4522ff9..e63bb64 100644 --- a/projectinformationvue/src/views/projectstart/modules/BusPlanPrint.vue +++ b/projectinformationvue/src/views/projectstart/modules/BusPlanPrint.vue @@ -344,7 +344,7 @@

八、安全策划

-
安全风险清单 -
- - - - - - - - - - - - - - - - - - - - - -
序号作业活动地点/场所/位置风险描述可能导致的事故类型应对措施责任人备注
{{ i + 1 }}{{ l.name }}{{ l.weizhiName }}{{ l.fxks }}{{ l.kndzsglx }}{{ l.ydcs }}{{ l.zrrName }}{{ l.note }}
+ --> +
         {{ busAqfxqd }}

九、资源保障策划

@@ -467,7 +446,7 @@ export default { divisionDutiesList: [], busContractGjchList: [], busContractZscqList: [], - busAqfxqdList: [], + busAqfxqd: '', externalCollaborationList: [], vhtml: '', vhtmlc: '', @@ -927,8 +906,8 @@ export default { getActionAwait('/busContractZscq/queryByProjectId', { projectId: record.projectId }).then((res) => { that.busContractZscqList = res.result }) - getActionAwait('/busAqfxqd/queryByProjectId', { projectId: record.projectId }).then((res) => { - that.busAqfxqdList = res.result + getActionAwait('/busPlanning/queryById', { id: record.id }).then((res) => { + that.busAqfxqd = res.result.busAqfxqd }) //根据项目id查询 外部协作策划 getActionAwait('/busExternalCollaboration/queryByProjectId', { projectId: record.projectId }).then((res) => { diff --git a/projectinformationvue/src/views/projectstart/modules/BusPlanningForm.vue b/projectinformationvue/src/views/projectstart/modules/BusPlanningForm.vue index 1265040..a9d6a06 100644 --- a/projectinformationvue/src/views/projectstart/modules/BusPlanningForm.vue +++ b/projectinformationvue/src/views/projectstart/modules/BusPlanningForm.vue @@ -150,7 +150,8 @@  （可参考质量管理体系文件中DKSY/Q8.1-01-2020/DKSY技术服务控制程/QP8.1-02-2020综合保障控制程序部分，可单独成册） - + 依据CB 30022-2018《武器装备生产策划安全要求》、CB 30023-2018《型号工程方案阶段安全风险评估要求》等要求，针对型号项目设计、试验、生产、服务保障等全寿期开展安全生产工作策划，按过程识别各阶段安全风险并制定应对措施。 @@ -848,68 +849,68 @@ export default { }, ], }, - table12: { - loading: false, - dataSource: [], - columns: [ - { - title: '作业活动', - key: 'name', - width: '13%', - type: FormTypes.input, - defaultValue: '', - }, - { - title: '地点/场所/位置', - key: 'weizhiName', - width: '13%', - type: FormTypes.input, - defaultValue: '', - }, - { - title: '风险描述', - key: 'fxks', - width: '13%', - type: FormTypes.input, - defaultValue: '', - }, - { - title: '可能导致的事故类型', - key: 'kndzsglx', - width: '13%', - type: FormTypes.input, - defaultValue: '', - }, - { - title: '应对措施', - key: 'ydcs', - width: '13%', - type: FormTypes.input, - defaultValue: '', - }, - { - title: '责任人', - key: 'zrrName', - width: '13%', - type: FormTypes.input, - defaultValue: '', - }, - { - title: '备注', - key: 'note', - width: '13%', - type: FormTypes.input, - defaultValue: '', - }, - { - title: '操作', - key: 'action', - width: '100px', - type: FormTypes.slot, - slotName: 'action', - }, - ], - }, + // table12: { + // loading: false, + // dataSource: [], + // columns: [ + // { + // title: '作业活动', + // key: 'name', + // width: '13%', + // type: FormTypes.input, + // defaultValue: '', + // }, + // { + // title: '地点/场所/位置', + // key: 'weizhiName', + // width: '13%', + // type: FormTypes.input, + // defaultValue: '', + // }, + // { + // title: '风险描述', + // key: 'fxks', + // width: '13%', + // type: FormTypes.input, + // defaultValue: '', + // }, + // { + // title: '可能导致的事故类型', + // key: 'kndzsglx', + // width: '13%', + // type: FormTypes.input, + // defaultValue: '', + // }, + // { + // title: '应对措施', + // key: 'ydcs', + // width: '13%', + // type: FormTypes.input, + // defaultValue: '', + // }, + // { + // title: '责任人', + // key: 'zrrName', + // width: '13%', + // type: FormTypes.input, + // defaultValue: '', + // }, + // { + // title: '备注', + // key: 'note', + // width: '13%', + // type: FormTypes.input, + // defaultValue: '', + // }, + // { + // title: '操作', + // key: 'action', + // width: '100px', + // type: FormTypes.slot, + // slotName: 'action', + // }, + // ], + // }, model: {}, labelCol: { xs: { span: 24 }, @@ -1031,7 +1032,7 @@ export default { busProjectOutsourcingExpenditurePlanningList: '/busProjectOutsourcingExpenditurePlanning/queryByProjectId', busContractGjchList: '/busContractGjch/queryByProjectId', busContractZscqList: '/busContractZscq/queryByProjectId', - busAqfxqdList: '/busAqfxqd/queryByProjectId', + // busAqfxqdList: '/busAqfxqd/queryByProjectId', }, } }, @@ -1154,7 +1155,7 @@ export default { getRefPromise(this, 'editableTable9'), getRefPromise(this, 'editableTable10'), getRefPromise(this, 'editableTable11'), - getRefPromise(this, 'editableTable12'), + // getRefPromise(this, 'editableTable12'), ]) }, /** 查询某个tab的数据 */ @@ -1181,7 +1182,7 @@ export default { busProjectOutsourcingExpenditurePlanningList: allValues.tablesValue[5].values, busContractGjchList: allValues.tablesValue[6].values, busContractZscqList: allValues.tablesValue[7].values, - busAqfxqdList: allValues.tablesValue[8].values, + // busAqfxqdList: allValues.tablesValue[8].values, } }, @@ -1233,7 +1234,7 @@ export default { that.requestTableData(that.url.busContractAcceptanceList, params, that.table7) that.requestTableData(that.url.busContractGjchList, params, that.table10) that.requestTableData(that.url.busContractZscqList, params, that.table11) - that.requestTableData(that.url.busAqfxqdList, params, that.table12) + // that.requestTableData(that.url.busAqfxqdList, params, that.table12) let paramsv = { busPlanningId: record.id } that.requestTableData(that.url.busProjectFinancialPlanningList, paramsv, that.table8)