From c884fa746282014dee008155154430687216375b Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 17 Jul 2024 11:35:41 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF]?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lang/standardRegulationLibrary/en-us.js   |  1 +
 .../lang/standardRegulationLibrary/zh-cn.js   |  1 +
 .../dynamicMessage/DynamicMessageDetail.vue   | 12 ++++-
 .../dynamicMessage/DynamicMessageFormPage.vue | 45 +++++++++++++++----
 .../dynamicMessage/DynamicMessageList.vue     |  6 +++
 5 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js
index 75ae605..064cc43 100644
--- a/src/common/lang/standardRegulationLibrary/en-us.js
+++ b/src/common/lang/standardRegulationLibrary/en-us.js
@@ -39,6 +39,7 @@ module.exports = {
   },
   // 动态消息
   dynamicMessage: {
+    source: 'Source',
     dynamicHeading: 'Dynamic heading',
     dynamicCataloging: 'Dynamic cataloging',
     releaseStatus: 'Release status',
diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js
index 718e5f4..b3e5955 100644
--- a/src/common/lang/standardRegulationLibrary/zh-cn.js
+++ b/src/common/lang/standardRegulationLibrary/zh-cn.js
@@ -40,6 +40,7 @@ module.exports = {
   },
   // 动态消息
   dynamicMessage: {
+    source: '来源',
     dynamicHeading: '动态标题',
     dynamicCataloging: '动态分类',
     releaseStatus: '发布状态',
diff --git a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageDetail.vue b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageDetail.vue
index 010184c..3ecb599 100644
--- a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageDetail.vue
+++ b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageDetail.vue
@@ -24,6 +24,12 @@
           <span>{{ detailData.releaseTime }}</span>
         </div>
       </div>
+      <div class="more-decoration">
+        <div class="writer decoration-item">
+          <label>{{ $t('standardRegulationLibrary.dynamicMessage.pushRange') }}</label>
+          <span style="word-break: break-all;">{{ detailData.pushRange_dictText }}</span>
+        </div>
+      </div>
       <div class="container">
         <div class="container-title">{{ $t('standardRegulationLibrary.dynamicMessage.dynamicDetails') }}</div>
         <div v-html="detailData.dynamicDetails"></div>
@@ -90,7 +96,6 @@ export default {
 
 .decoration {
   padding: 8px 0;
-  border-bottom: 1px solid #E5E6EB;
   text-align: right;
 
   &-item {
@@ -99,6 +104,11 @@ export default {
   }
 }
 
+.more-decoration {
+  padding: 8px 0;
+  border-bottom: 1px solid #E5E6EB;
+}
+
 .writer {
   font-size: 14px;
   font-family: PingFang SC-Regular, PingFang SC, sans-serif;
diff --git a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue
index 486d494..2cb16da 100644
--- a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue
+++ b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue
@@ -23,16 +23,37 @@
                                @change="handleCatalogingChange" />
           </a-form-item>
         </a-col>
+        <!--来源-->
+        <a-col :span="12">
+          <a-form-item :labelCol="labelCol"
+                       :wrapperCol="wrapperCol"
+                       :label="$t('standardRegulationLibrary.dynamicMessage.source')">
+            <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.dynamicMessage.source')"
+                     :maxLength="200"
+                     v-decorator="['source', validatorRules.source]" />
+          </a-form-item>
+        </a-col>
+        <!--推送范围-->
+        <a-col :span="12">
+          <a-form-item :labelCol="labelCol"
+                       :wrapperCol="wrapperCol"
+                       :label="$t('standardRegulationLibrary.dynamicMessage.pushRange')">
+            <user-selection v-decorator="['pushRange', validatorRules.pushRange]"
+                            type="checkbox"
+                            :name-str="modal.pushRange_dictText"
+                            :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.dynamicMessage.pushRange')" />
+          </a-form-item>
+        </a-col>
       </a-row>
       <!--推送范围-->
-      <a-form-item :labelCol="lineLabelCol"
-                   :wrapperCol="lineWrapperCol"
-                   :label="$t('standardRegulationLibrary.dynamicMessage.pushRange')">
-        <user-selection v-decorator="['pushRange', validatorRules.pushRange]"
-                        type="checkbox"
-                        :name-str="modal.pushRange_dictText"
-                        :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.dynamicMessage.pushRange')" />
-      </a-form-item>
+      <!--<a-form-item :labelCol="lineLabelCol"-->
+      <!--             :wrapperCol="lineWrapperCol"-->
+      <!--             :label="$t('standardRegulationLibrary.dynamicMessage.pushRange')">-->
+      <!--  <user-selection v-decorator="['pushRange', validatorRules.pushRange]"-->
+      <!--                  type="checkbox"-->
+      <!--                  :name-str="modal.pushRange_dictText"-->
+      <!--                  :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.dynamicMessage.pushRange')" />-->
+      <!--</a-form-item>-->
       <!--动态详情-->
       <a-form-item v-if="needWriteDynamicDetails"
                    :labelCol="lineLabelCol"
@@ -214,6 +235,14 @@ export default {
           }],
           validateTrigger: 'change'
         },
+        // 来源
+        source: {
+          rules: [{
+            required: true,
+            message: this.$t('pleaseEnter') + this.$t('standardRegulationLibrary.dynamicMessage.source')
+          }],
+          validateTrigger: 'blur'
+        },
         // 推送范围
         pushRange: {
           rules: [{
diff --git a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue
index 35e07e2..d4143eb 100644
--- a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue
+++ b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageList.vue
@@ -116,6 +116,12 @@ export default {
           title: this.$t('standardRegulationLibrary.dynamicMessage.dynamicCataloging'),
           width: 150
         },
+        // 来源
+        {
+          dataIndex: 'source',
+          title: this.$t('standardRegulationLibrary.dynamicMessage.source'),
+          width: 150
+        },
         // 编辑人
         {
           dataIndex: 'writer_dictText',