From a1e4a12ff6195184a487f51095e11584494421bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Thu, 14 Sep 2023 14:33:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B1=9E=E6=80=A7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B4=E4=BB=BD=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/standardRegulationLibraryApi.js       |  3 ++
 src/assets/less/common.less                   |  2 +
 src/components/customField/AddForm.vue        | 24 +++++++++++-
 src/components/jero/JDate.vue                 | 11 +++++-
 src/enums/commonEnums.js                      |  3 +-
 .../commonPage/StandardDetailPage.vue         | 39 ++++++++++++++++++-
 .../modules/DomesticStandardModal.vue         |  2 +-
 7 files changed, 78 insertions(+), 6 deletions(-)

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 @@
               </a-form-model-item>
             </div>
           </a-col>
+          <!--14 年份选择-->
+          <a-col :span="12" v-else-if="item.fieldShowType === FieldType.YEAR_PICKER.value">
+            <div class="box-title-text" :title="item.dbFieldTxt">
+              <div class="title-text">
+                <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                <span class="title-text-text">{{ item.dbFieldTxt }}</span>
+              </div>
+              <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                <j-date show-type="year"
+                        v-model="formInline[item.dbFieldName]"
+                        :default-value="defaultValue[item.dbFieldName]"
+                        date-format="YYYY"
+                        :placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
 
         </div>
       </a-row>
@@ -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 {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-form-item-children {
+  width: 100%;
+  display: inline-block;
+}
 </style>
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">
     </a-date-picker>
@@ -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 @@
 <script>
 import '@assets/less/common.less'
 import { TagsTypeEnums } from '../../../enums/commonEnums'
-import { getDomesticStandardFormModal, shareDomesticStandard } from '../../../api/standardRegulationLibraryApi'
+import { getDomesticStandardFormModal, shareDomesticStandard, getDomesticStandardDetail } from '../../../api/standardRegulationLibraryApi'
 import UploadRecordModal from './modules/UploadRecordModal.vue'
 import SubmitQuestionModal from './modules/SubmitQuestionModal.vue'
 import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
 import StandardResolutionSheetModal from './modules/StandardResolutionSheetModal.vue'
 
+// 国内标准权限
 const DomesticStandardPermission = {
   updateRecord: 'domesticStandard:updateRecord', // 更新记录
   submitQuestion: 'domesticStandard:submitQuestion', // 提交问题
@@ -88,6 +89,12 @@ const DomesticStandardPermission = {
   unwatermarkedDownload: 'domesticStandard:unwatermarkedDownload' // 无水印下载
 }
 
+// 国内标准接口
+const DomesticApi = {
+  getFormFunc: getDomesticStandardFormModal, // 获取字段
+  getDetailData: getDomesticStandardDetail // 获取详情数据
+}
+
 export default {
   name: 'StandardDetailPage',
   components: { UploadRecordModal, SubmitQuestionModal, UserSelectModal, StandardResolutionSheetModal },
@@ -112,9 +119,11 @@ export default {
     }
   },
   computed: {
+    // 页面标题
     pageTitle () {
       return TagsTypeEnums.nameOfIndex(this.$route.query.type)
     },
+    // 按钮权限
     btnPermission () {
       let permission = {}
       switch (this.$route.query.type) {
@@ -126,17 +135,30 @@ export default {
           break
       }
       return permission
+    },
+    // 操作接口
+    operateApiFunc () {
+      let func = {}
+      switch (this.$route.query.type) {
+        case TagsTypeEnums.DOMESTIC_LIST.value + '':
+          func = DomesticApi
+          break
+        default:
+          break
+      }
+      return func
     }
   },
   created () {
     this.initForm()
+    this.initDetailData()
   },
   methods: {
     /**
      * 获取页面字段
      */
     initForm () {
-      getDomesticStandardFormModal().then(res => {
+      this.operateApiFunc.getFormFunc().then(res => {
         if (res.success) {
           const data = res.result || {}
           this.partList = Object.keys(data)
@@ -146,6 +168,19 @@ export default {
         }
       })
     },
+    // 获取数据
+    initDetailData () {
+      this.loading = true
+      this.operateApiFunc.getDetailData({ id: this.$route.query.id }).then(res => {
+        if (res.success) {
+          this.detailData = Object.assign({}, res.result || {})
+        } else {
+          this.$message.warn(res.message)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     /**
      * 更新记录
      */
diff --git a/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticStandardModal.vue b/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticStandardModal.vue
index 60455baf..76c2fa65 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticStandardModal.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticStandardModal.vue
@@ -56,7 +56,7 @@ export default {
         standard_number: `${this.$t('standardRegulationLibrary.inputExample')}7258`
       },
       defaultValue: {
-        year_number: new Date().getFullYear()
+        year_number: new Date().getFullYear() + ''
       },
       isEdit: null // 是否编辑
     }