diff --git a/src/api/api.js b/src/api/api.js index ca1e71b6..077fa64e 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -138,10 +138,12 @@ const getWorkGroupTreeList = (params) => getAction('/sys/lawsWorkingGroup/list', // 企业级别映射管理,获取列表 const getEnterpriseLevelMapList = (params) => getAction('/sys/lawsGrade/list', params) +// 绑定零部件-获取拆分标准 +const getSplitStandardList = (params) => getAction('/laws/bindPart/selectStandard', params) // 绑定零部件-获取零部件 -const getPartInfo = (params) => getAction('', params) -// 根据标准id获取条款列表 -const getClauseListByStandard = (params) => getAction('', params) +// const getPartInfo = (params) => getAction('', params) +// 根据标准拆分id获取条款列表 +const getClauseListByStandardInfoId = (params) => postAction('/laws/bindPart/selectClause', params) // ASMS接口管理-新增 const addAsmsInterface = (params) => postAction('/docking/asms/api/lawsAsmsOpenApi/add', params) @@ -230,8 +232,9 @@ export { getEnterpriseLevelMapList, - getPartInfo, - getClauseListByStandard, + getSplitStandardList, + // getPartInfo, + getClauseListByStandardInfoId, getSSOUserInfo, getTodoSSOUserInfo, diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index b69a29ed..36de6c4d 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -589,7 +589,7 @@ module.exports = { articleNumber: '条文号', articleTitle: '条文标题', articleContent: '条文内容', - pleaseSelectStandard: '请先选择标准' + pleaseSelectStandard: '请先选择已拆分标准' }, // 企标计划选择器 enterprisePlanSelect: { diff --git a/src/components/selection/ClauseSelection.vue b/src/components/selection/ClauseSelection.vue index 5c97f2db..f2c6cc14 100644 --- a/src/components/selection/ClauseSelection.vue +++ b/src/components/selection/ClauseSelection.vue @@ -17,7 +17,7 @@ @@ -59,8 +59,8 @@ export default { required: false, default: null }, - // 标准id - standardId: { + // 标准拆分id + infoId: { type: String, required: false, default: '' @@ -69,7 +69,7 @@ export default { methods: { // 点击选择条款按钮 clauseClick () { - if (!this.standardId) { + if (!this.infoId) { this.$message.warning(this.$t('clauseSelect.pleaseSelectStandard')) return } diff --git a/src/components/selection/ClauseSelectionModal.vue b/src/components/selection/ClauseSelectionModal.vue index fc851e4b..48912cb8 100644 --- a/src/components/selection/ClauseSelectionModal.vue +++ b/src/components/selection/ClauseSelectionModal.vue @@ -69,7 +69,7 @@ + + diff --git a/src/components/selection/SplitStandardSelectionModal.vue b/src/components/selection/SplitStandardSelectionModal.vue new file mode 100644 index 00000000..4b677782 --- /dev/null +++ b/src/components/selection/SplitStandardSelectionModal.vue @@ -0,0 +1,353 @@ + + + + + diff --git a/src/views/system/bindingParts/BindingParts.vue b/src/views/system/bindingParts/BindingParts.vue index 29ec2e57..151b509f 100644 --- a/src/views/system/bindingParts/BindingParts.vue +++ b/src/views/system/bindingParts/BindingParts.vue @@ -10,7 +10,7 @@ + v-model="queryParam.partNo"> @@ -26,7 +26,7 @@ + v-model="queryParam.standardNo"> @@ -135,7 +135,7 @@ export default { title: this.$t('system.bindingParts.partNumber'), align: 'center', width: 180, - dataIndex: 'partNumber', + dataIndex: 'partNo', scopedSlots: { customRender: 'text' } }, { // 零部件名称 @@ -149,7 +149,7 @@ export default { title: this.$t('standardNumber'), align: 'center', width: 180, - dataIndex: 'standardNumber', + dataIndex: 'standardNo', scopedSlots: { customRender: 'standardSlot' } }, { // 标准名称 @@ -163,21 +163,21 @@ export default { title: this.$t('system.bindingParts.clauseNumber'), align: 'center', width: 180, - dataIndex: 'clauseNumber', + dataIndex: 'clauseNos', scopedSlots: { customRender: 'clauseSlot' } }, { // 绑定人员 title: this.$t('system.bindingParts.bindingPersonnel'), align: 'center', width: 180, - dataIndex: 'bindingPersonnel', + dataIndex: 'bindUser_dictText', scopedSlots: { customRender: 'text' } }, { // 绑定时间 title: this.$t('system.bindingParts.bindingTime'), align: 'center', width: 180, - dataIndex: 'bindingTime', + dataIndex: 'bindTime', scopedSlots: { customRender: 'text' } }, { // 操作 @@ -189,14 +189,11 @@ export default { } ], url: { - list: '', - deleteBatch: '', - delete: '', + list: '/laws/bindPart/page', + deleteBatch: '/laws/bindPart/deleteBatch', + delete: '/laws/bindPart/delete', useBindingRelationship: '' // 使用绑定关系 - }, - dataSource: [ - { id: 1, clauseNumber: 1 } - ] + } } }, methods: { diff --git a/src/views/system/bindingParts/modules/BingingPartsModal.vue b/src/views/system/bindingParts/modules/BingingPartsModal.vue index 99b2e0c2..4f7cfb81 100644 --- a/src/views/system/bindingParts/modules/BingingPartsModal.vue +++ b/src/views/system/bindingParts/modules/BingingPartsModal.vue @@ -13,26 +13,35 @@ - - - {{ item.number }} - - + + + + + + - - - {{ item.number }} - - + + + + + + - + @@ -44,16 +53,19 @@ - + @@ -62,20 +74,24 @@