diff --git a/src/api/standardRegulationLibraryApi.js b/src/api/standardRegulationLibraryApi.js index 669b83e9..042bfe0a 100644 --- a/src/api/standardRegulationLibraryApi.js +++ b/src/api/standardRegulationLibraryApi.js @@ -32,6 +32,8 @@ const addDomesticStandard = (params) => postAction('/laws/standard/domestic/comm const editDomesticStandard = (params) => postAction('/laws/standard/domestic/commonEdit', params) // 国内标准-配置标准-过滤没有选中体系的数据 const getDomesticStandardNoSystem = (params) => getAction('/laws/standard/common/getStandardRightBox', params) +// 国内标准-获取详情信息 +const getDomesticStandardDetail = (params) => getAction('/laws/standard/domestic/getByIdAndModule', params) // 海外标准-获取查询条件 const getOverseasStandardSearchForm = (params) => getAction('/laws/standard/overseas/getQueryCondition', params) @@ -60,6 +62,7 @@ export { addDomesticStandard, editDomesticStandard, getDomesticStandardNoSystem, + getDomesticStandardDetail, // 海外标准 getOverseasStandardSearchForm, diff --git a/src/assets/less/common.less b/src/assets/less/common.less index f5d3a0c9..28ccb065 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -600,6 +600,8 @@ font-size: 16px; font-family: PingFang SC-Regular, PingFang SC, sans-serif; color: #1D2129; + flex: 1; + width: 0; } } diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 71be94b7..0a12d37e 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -222,6 +222,22 @@ + + +
+
+ * + {{ item.dbFieldTxt }} +
+ + + +
+
@@ -326,7 +342,8 @@ export default { }, methods: { add () { - this.formInline = Object.assign({}, this.defaultValue) + this.$set(this.formInline, 'year_number', '2023') + this.$forceUpdate() this.type = 'add' this.getForm() }, @@ -483,4 +500,9 @@ export default { diff --git a/src/components/jero/JDate.vue b/src/components/jero/JDate.vue index 67afeb62..752cba21 100644 --- a/src/components/jero/JDate.vue +++ b/src/components/jero/JDate.vue @@ -10,6 +10,7 @@ :value="momVal" :showTime="true" :format="dateFormat" + style="width: 100%" v-bind="$attrs" v-on="childListeners" :getCalendarContainer="getCalendarContainer"> @@ -24,6 +25,7 @@ :value="momVal" :showTime="false" :format="dateFormat" + style="width: 100%" v-bind="$attrs" v-on="childListeners" :getCalendarContainer="getCalendarContainer"> @@ -35,6 +37,7 @@ :value="momVal" :disabled="disabled || readOnly" :format="dateFormat" + style="width: 100%" v-bind="$attrs" v-on="childListeners" @change="handleMonthChange"> @@ -51,6 +54,7 @@ v-bind="$attrs" v-on="childListeners" :getCalendarContainer="getCalendarContainer" + style="width: 100%" @openChange="openChangeOne" @panelChange="panelChangeOne"> @@ -116,6 +120,7 @@ export default { }, watch: { value (val) { + console.log(val) const fm = this.dateFormat moment.prototype.toJSON = function () { return moment(this).format(fm) @@ -123,7 +128,11 @@ export default { if (!val) { this.momVal = null } else { - this.momVal = moment(val, this.dateFormat) + if (this.showType === 'year') { + this.year = val + } else { + this.momVal = moment(val, this.dateFormat) + } } } }, diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index d826f41e..94473e6e 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -20,7 +20,8 @@ export const FieldType = { OPTION_SINGLE: { text: '下拉单选', value: '10' }, OPTION_MORE: { text: '下拉多选', value: '11' }, TREE: { text: '树形结构', value: '12' }, - TEXT_LINK: { text: '输入框(链接)', value: '13' } + TEXT_LINK: { text: '输入框(链接)', value: '13' }, + YEAR_PICKER: { text: '年份选择', value: '14' } } export const TagsTypeEnums = new EsEnums({ diff --git a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue index e24e2e0c..f67f551d 100644 --- a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue +++ b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue @@ -73,12 +73,13 @@