diff --git a/src/api/api.js b/src/api/api.js index 1a40ddc..bfe3722 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -43,6 +43,9 @@ const getPersonInfoList = (params) => getAction('/activiti/getNodeList', params) // 获取标准左侧树列表(标准体系) const getTreeList = (params) => getAction('/laws/standard/lawsTreeNode/enterprise', params) +// 内部工作组,左侧树查询 +const getWorkGroupTreeList = (params) => getAction('/sys/lawsWorkingGroup/list', params) + // 标准入库/变更流程------------ // 国内法规标准-获取表单模型 const getDomesticStandardFormModal = (params) => getAction('/laws/standard/domestic/getFormModel', params) @@ -263,6 +266,8 @@ export { getPersonInfoList, getTreeList, + getWorkGroupTreeList, + getDomesticStandardFormModal, getOverseasStandardForm, queryStandardECProcessData, diff --git a/src/assets/less/common.less b/src/assets/less/common.less index e8dc3d6..0f8edd1 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -127,4 +127,24 @@ /* ant表单样式 */ .ant-form-item { font-size: 0.24rem; +} + +// 所有的form表单下 required 必填项 前面加红字提示 +.required { + /deep/ .van-cell__title { + span { + display: inline-block; + line-height: 100%; + vertical-align: middle; + } + span::before{ + content: '*'; + display: inline-block; + height: 100%; + line-height: 100%; + vertical-align: middle; + margin-right: 0.12rem; + color: #E63636; + } + } } \ No newline at end of file diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 917ec43..aab62fb 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -46,6 +46,7 @@ module.exports = { no: '否', standardText: '标准文本', look: '查看', + pleaseEnterPersonnelInfo: '请完整填写人员信息', // 标准法规入库/变更流程 standardEntryOrChange: { source: '来源', @@ -142,7 +143,13 @@ module.exports = { good: '优良', excellent: '优秀', grade: '评分', - groundsForDemerit: '扣分理由' + groundsForDemerit: '扣分理由', + pleaseEnterAllMarkItem: '请填写所有评分项', + isOpenComment: '是否开启征求意见', + departmentalLiaison: '部门联络人', + deadlineForComments: '征求意见截止日期', + workingGroup: '工作组', + deadlineNeedGreaterThan: '征求意见截止日期需要比征求意见稿计划完成日期早' }, // 企标复审流程 esRecheck: { diff --git a/src/components/ProcessCommonLayout.vue b/src/components/ProcessCommonLayout.vue index 4791035..580cb69 100644 --- a/src/components/ProcessCommonLayout.vue +++ b/src/components/ProcessCommonLayout.vue @@ -32,7 +32,17 @@

{{ item.nodeName }}

-

{{ item.linkUserIds_dictText }}

+

{{ item.linkUserIds_dictText }}

+
+ +
@@ -48,9 +58,11 @@ + + diff --git a/src/components/SelectUserByWorkGroupField.vue b/src/components/SelectUserByWorkGroupField.vue new file mode 100644 index 0000000..c44e743 --- /dev/null +++ b/src/components/SelectUserByWorkGroupField.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/components/SelectUserField.vue b/src/components/SelectUserField.vue index f5d0c48..7645d3a 100644 --- a/src/components/SelectUserField.vue +++ b/src/components/SelectUserField.vue @@ -3,7 +3,7 @@ - + @@ -42,7 +47,7 @@ :placeholder="$t('pleaseEnter')" :border="false" input-align="left" - class="vertical-form-item"/> + class="vertical-form-item required rate-label"/> @@ -58,7 +63,9 @@ const fixDataSourse = [ '发布日期、生效日期、引用文件章节、图表等内容是否齐全、准确、清晰。', scoreRange: [ { common: '0~5', good: '6~10', excellent: '11~15' } - ] + ], + min: 0, + max: 15 }, { id: 4, @@ -67,7 +74,9 @@ const fixDataSourse = [ '引用标准、技术要求、试验检测方法等各个方面是否符合/严于法律法规、国家标准、行业标准等要求。', scoreRange: [ { common: '0~20', good: '21~35', excellent: '36~45' } - ] + ], + min: 0, + max: 45 }, { id: 7, @@ -75,7 +84,9 @@ const fixDataSourse = [ desc: '评估标准文件的应用范围是否明确、适用,是否与研发工艺、质量、生产、采购等环节相符合。', scoreRange: [ { common: '0~3', good: '4~6', excellent: '7~10' } - ] + ], + min: 0, + max: 10 }, { id: 10, @@ -84,7 +95,9 @@ const fixDataSourse = [ '(比如设计规范模版、释放规范模版、产品技术条件模版)所规定的要素和环节。', scoreRange: [ { common: '0~5', good: '6~10', excellent: '11~15' } - ] + ], + min: 0, + max: 15 }, { id: 13, @@ -92,7 +105,9 @@ const fixDataSourse = [ desc: '评估标准文件的可读性是否良好,是否有错别字,是否易于阅读和理解。', scoreRange: [ { common: '0~2', good: '3~4', excellent: '5' } - ] + ], + min: 0, + max: 5 }, { id: 16, @@ -100,7 +115,9 @@ const fixDataSourse = [ desc: '评估标准文件的权威性是否足够,是否得到了相关方的认可和信任,是否得到了有效的贯彻和执行。', scoreRange: [ { common: '0~3', good: '4~6', excellent: '7~10' } - ] + ], + min: 0, + max: 10 } ] @@ -149,6 +166,38 @@ export default { this.$refs.baseInfoForm.initData(data) }) }, + getData () { + // 把数据抛出,在线编辑不知道要不要抛 + const data = {} + data.reviewMeetingDetails = this.dataSource + data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData()) + return data + }, + // 外层获取数据要过校验,返回false表示没有通过校验 + getDataValidate () { + let hasErr = false + const arr = [] + for (const item in this.dataSource) { + if (!(this.dataSource[item].evaluateScore + '') || !this.dataSource[item].deductionScoreReason) { + hasErr = true + break + } else { + // 是有评分和扣分理由的行 + arr.push({ + ...this.dataSource[item], + evaluateItem: (Number(item) + 1) + '' + }) + } + } + let data = {} // 需要返回的数据 + if (hasErr) { + this.$message(this.$t('enStandardRevision.pleaseEnterAllMarkItem')) + data = false + } else { + data.reviewMeetingDetails = arr + } + return data + } } } @@ -183,4 +232,29 @@ export default { color: #888888; margin: 0 0.32rem; } + +// 评分和扣分理由的label +.rate-label { + /deep/ .van-field__label { + font-size: 0.3rem; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + color: rgba(29,33,41,0.9) !important; + } +} + +// 步进器样式 +/deep/ .van-stepper { + .van-stepper__minus { + background: transparent; + } + .van-stepper__plus { + background: transparent; + } + .van-stepper__input { + background: transparent; + border: 0.01rem solid #C9CDD4; + border-radius: 0.04rem; + } +} diff --git a/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue index 4bbc75f..fad7ec0 100644 --- a/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/module/StandardizationCheckBaseInfo.vue @@ -144,7 +144,7 @@ export default { return data }, userNameChange (value, fieldName) { - this.formInline[fieldName + 'dictText'] = value + this.formInline[fieldName + '_dictText'] = value }, // 是否可进行评审会 reviewMeetingFlagChange () {