diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index d590e81f..85dd6d5f 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -210,5 +210,34 @@ module.exports = { standardText: '标准文本', selectText: '选择文本', selectionStandardFile: '选择标准文件' + }, + // 企标稽查计划 + esInspectionPlan: { + inspectionPlan: '稽查计划', + inspectionBasisStandardNumber: '稽查依据标准号', + inspectionBasisStandardName: '稽查依据标准名称', + planInspectionObjects: '计划稽查对象', + mainDutyStandardizationGroup: '主责标准化工作组', + department: '所属部门', + planInspectionDate: '计划稽查日期', + inspectionDirector: '稽查负责人', + standardizationGroupContactPerson: '标准化组对接人', + solicitingOpinionsFrom: '征求意见对象', + remark: '备注', + departmentPersonnel: '所属部门人员', + creator: '创建人', + initiator: '发起人', + departOpinion: '所属部门意见', + node1: '稽查联络人发起计划', + node2: '稽查征求意见对象填写征求意见', + node3: '稽查联络人汇总', + node4: '相关人员会签', + node5: '联络人主管级领导批准', + opinion: '意见', + writeOpinion: '填写意见', + solicitOpinion: '征求意见', + solicitOpinionObject: '征求意见对象', + isCountersign: '是否会签', + countersignRelevantPersonnel: '会签相关人员' } } diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 3e89ee3d..9bf3603b 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -226,5 +226,34 @@ module.exports = { standardText: '标准文本', selectText: '选择文本', selectionStandardFile: '选择标准文件' + }, + // 企标稽查计划 + esInspectionPlan: { + inspectionPlan: '稽查计划', + inspectionBasisStandardNumber: '稽查依据标准号', + inspectionBasisStandardName: '稽查依据标准名称', + planInspectionObjects: '计划稽查对象', + mainDutyStandardizationGroup: '主责标准化工作组', + department: '所属部门', + planInspectionDate: '计划稽查日期', + inspectionDirector: '稽查负责人', + standardizationGroupContactPerson: '标准化组对接人', + solicitingOpinionsFrom: '征求意见对象', + remark: '备注', + departmentPersonnel: '所属部门人员', + creator: '创建人', + initiator: '发起人', + departOpinion: '所属部门意见', + node1: '稽查联络人发起计划', + node2: '稽查征求意见对象填写征求意见', + node3: '稽查联络人汇总', + node4: '相关人员会签', + node5: '联络人主管级领导批准', + opinion: '意见', + writeOpinion: '填写意见', + solicitOpinion: '征求意见', + solicitOpinionObject: '征求意见对象', + isCountersign: '是否会签', + countersignRelevantPersonnel: '会签相关人员' } } diff --git a/src/components/JMultipleDatePicker.vue b/src/components/JMultipleDatePicker.vue index c1f1d72f..2a2baaf6 100644 --- a/src/components/JMultipleDatePicker.vue +++ b/src/components/JMultipleDatePicker.vue @@ -143,6 +143,7 @@ export default { display: flex !important; justify-content: space-between !important; flex-direction: row-reverse !important; + align-items: center !important; } // 删除弹出层的今天按钮 :global(.ant-calendar-today-btn) { diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index 48869d0f..69ad7a1d 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -2,7 +2,7 @@
{{this.$t('standardSelect.standardSelection')}} @@ -30,6 +30,11 @@ export default { disabled: { type: Boolean, default: false + }, + // 只禁用输入框 + disabledInput: { + type: Boolean, + default: false } }, methods: { diff --git a/src/components/selection/WorkGroupSelection.vue b/src/components/selection/WorkGroupSelection.vue index cf51116e..cd82f238 100644 --- a/src/components/selection/WorkGroupSelection.vue +++ b/src/components/selection/WorkGroupSelection.vue @@ -1,7 +1,7 @@