From 0b193de9e0070eb0d49c21164bdf51abdf1d0451 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 25 Sep 2023 15:51:34 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E8=87=AA=E6=B5=8B?=
 =?UTF-8?q?bug=EF=BC=8C=E5=AE=8C=E5=96=84=E9=97=AE=E7=AD=94=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/businessSupport/en.js         |  22 ++-
 src/common/lang/businessSupport/zh.js         |   8 +-
 src/components/customField/Search.vue         |   2 +-
 .../selection/StandardModelSelection.vue      |   8 +-
 .../selection/StandardModelSelectionModal.vue |  14 +-
 src/mixins/JeroListMixin.js                   |  43 +++++
 .../QuestionAnswerList.vue                    |  38 +++-
 .../modules/QuizModal.vue                     | 132 +++++++------
 .../{modules => page}/AnswerPage.vue          | 180 +++++++++++-------
 .../check/CheckList.vue                       |   6 +-
 .../plan/PlanList.vue                         |   2 +-
 .../publicize/EnterpriseStandardPublicize.vue |   5 +-
 .../reviewMeeting/ReviewMeetingList.vue       |   4 +-
 .../reviewPlan/ReviewPlanList.vue             |   4 +-
 .../FriendshipLinkList.vue                    |   6 +-
 .../internalWorkGroup/WorkingGroupList.vue    |   2 +-
 16 files changed, 318 insertions(+), 158 deletions(-)
 rename src/views/businessSupport/questionAnswerLibrary/{modules => page}/AnswerPage.vue (52%)

diff --git a/src/common/lang/businessSupport/en.js b/src/common/lang/businessSupport/en.js
index 18b52e6e..02625ce5 100644
--- a/src/common/lang/businessSupport/en.js
+++ b/src/common/lang/businessSupport/en.js
@@ -5,13 +5,19 @@ module.exports = {
   },
   // 问答库
   questionAnswer: {
-    classify: '分类',
-    title: '标题',
-    quiz: '提问',
-    questionDesc: '问题描述',
-    attach: '附件',
-    quizTime: '提问时间',
-    answer: '回答',
-    poster: '发帖人'
+    classify: 'Classify',
+    title: 'Title',
+    quiz: 'Quiz',
+    questionDesc: 'Problem Description',
+    attach: 'Attachment',
+    quizTime: 'Question Time',
+    answer: 'answer',
+    poster: 'Poster',
+    answerNum: 'replies',
+    top: '【top】',
+    cancelTop: 'untop',
+    setTop: 'Set To Top',
+    answerQuestion: 'reply to a question',
+    word: 'word'
   }
 }
diff --git a/src/common/lang/businessSupport/zh.js b/src/common/lang/businessSupport/zh.js
index 5af68475..36ddb563 100644
--- a/src/common/lang/businessSupport/zh.js
+++ b/src/common/lang/businessSupport/zh.js
@@ -12,6 +12,12 @@ module.exports = {
     attach: '附件',
     quizTime: '提问时间',
     answer: '回答',
-    poster: '发帖人'
+    poster: '发帖人',
+    answerNum: '个回复',
+    top: '【置顶】',
+    cancelTop: '取消置顶',
+    setTop: '设置为置顶',
+    answerQuestion: '回复问题',
+    word: '字'
   }
 }
diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index e3f966ff..597496fa 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -197,7 +197,7 @@
           <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
         </a>
         <a-button icon="search" type="primary" @click="searchQuery" style="margin-left: 8px" v-has="searchHas">{{ $t('query') }}</a-button>
-        <a-button icon="reload" style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
+        <a-button icon="reload" type="primary" ghost style="margin-left: 8px" @click="searchReset">{{ $t('reset') }}</a-button>
       </div>
     </a-row>
   </a-form>
diff --git a/src/components/selection/StandardModelSelection.vue b/src/components/selection/StandardModelSelection.vue
index e9d780f1..4eefd4e3 100644
--- a/src/components/selection/StandardModelSelection.vue
+++ b/src/components/selection/StandardModelSelection.vue
@@ -8,7 +8,7 @@
         {{this.$t('standardSelect.standardSelection')}}
       </a-button>
     </div>
-    <standard-model-selection-modal ref="standardSelectionModal" v-bind="$attrs" :value="value" @input="modalInput" @nameChange="modalNameChange"></standard-model-selection-modal>
+    <standard-model-selection-modal ref="standardSelectionModal" v-bind="$attrs" :value="value" @change="modalInput" @nameChange="modalNameChange"></standard-model-selection-modal>
   </div>
 </template>
 
@@ -39,10 +39,10 @@ export default {
     },
     // 输入框输入监听
     indexClick (event) {
-      this.$emit('input', event.target.value)
+      this.$emit('change', event.target.value)
     },
     modalInput (value) {
-      this.$emit('input', value)
+      this.$emit('change', value)
     },
     modalNameChange (value) {
       this.$emit('nameChange', value)
@@ -50,7 +50,7 @@ export default {
   },
   model: {
     prop: 'value',
-    event: 'input'
+    event: 'change'
   }
 }
 </script>
diff --git a/src/components/selection/StandardModelSelectionModal.vue b/src/components/selection/StandardModelSelectionModal.vue
index a312eaff..36f1c439 100644
--- a/src/components/selection/StandardModelSelectionModal.vue
+++ b/src/components/selection/StandardModelSelectionModal.vue
@@ -15,6 +15,7 @@
             <a-col :sm="8">
               <a-form-item :label="$t('standardSelect.source')" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag style="width: 100%" v-model="queryParam.source"
+                                   :disabled="disabledSourceSearch"
                                    :placeholder="$t('pleaseSelect')+$t('standardSelect.source')"
                                    :triggerChange="false" dictCode="standard_source"/>
               </a-form-item>
@@ -66,6 +67,10 @@ export default {
     value: {
       type: String,
       default: ''
+    },
+    disabledSourceSearch: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -132,10 +137,11 @@ export default {
   },
   methods: {
     open () {
-      this.source ? this.queryParam.source = this.source : this.queryParam = {}
       this.visible = true
-      this.queryParam = {}
-      this.replacePage()
+      this.$nextTick(() => {
+        this.source ? this.queryParam.source = this.source : this.queryParam = {}
+        this.replacePage()
+      })
     },
     // 获取表格数据
     replacePage () {
@@ -181,7 +187,7 @@ export default {
           serialNumber.push(res.standardNumber)
           serialNameArr.push(res.standardName)
         })
-        this.$emit('input', serialNumber.join(','))
+        this.$emit('change', serialNumber.join(','))
         this.$emit('nameChange', serialNameArr.join(','))
         this.visible = false
       } else {
diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 72c94de0..eaf78aba 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -324,6 +324,49 @@ export const JeroListMixin = {
         modalLoading.destroy()
       })
     },
+    // 带文件导出
+    handleFileExport (fileName) {
+      if (!fileName || typeof fileName !== 'string') {
+        fileName = '导出文件'
+      }
+      const param = this.getQueryParams()
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        param.selections = this.selectedRowKeys.join(',')
+      }
+      console.log('导出参数', param)
+      // 加一个大的提示
+      const modalLoading = this.$info({
+        title: '提示',
+        content: <span>正在导出，请稍候 <a-spin size="small" /></span>,
+        keyboard: false
+      })
+      // 把知道了这个按钮去掉
+      this.$nextTick(() => {
+        document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display:none'
+      })
+      downFile(this.url.exportZipUrl, param).then((data) => {
+        if (!data) {
+          this.$message.warning('文件下载失败')
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data]), fileName + '.zip')
+        } else {
+          const url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+          const link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName + '.zip')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link) // 下载完成移除元素
+          window.URL.revokeObjectURL(url) // 释放掉blob对象
+        }
+      }).finally(() => {
+        // 销毁这个提示
+        modalLoading.destroy()
+      })
+    },
     /* 导入 */
     handleImportExcel (info) {
       // 加一个大的提示
diff --git a/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue b/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue
index ba42bfef..936f5cc7 100644
--- a/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue
+++ b/src/views/businessSupport/questionAnswerLibrary/QuestionAnswerList.vue
@@ -37,7 +37,7 @@
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'businessSupport:questionAnswer:search'">{{ $t('query') }}</a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+            <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
         </a-row>
@@ -155,7 +155,7 @@ export default {
           title: this.$t('title'),
           align: 'center',
           width: 180,
-          dataIndex: 'title',
+          dataIndex: 'titleSlot',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -195,9 +195,16 @@ export default {
         }
       ],
       url: {
-        list: ''
+        list: '',
+        delete: ''
       },
-      userInfo: {}
+      userInfo: {},
+      dataSource: [
+        {
+          id: 1,
+          // createBy: 'e9ca23d68d884d4ebb19d07889727dae'
+        }
+      ]
     }
   },
   mounted () {
@@ -208,9 +215,6 @@ export default {
     handleQuiz () {
       this.$refs.quizModal.title = this.$t('businessSupport.questionAnswer.quiz')
       this.$refs.quizModal.open()
-      // this.$router.push({
-      //   path: '/businessSupport/questionDetail'
-      // })
     },
     // 点击相关材料
     handleAttachClick (record) {
@@ -236,6 +240,26 @@ export default {
       // 其余可预览文件仍使用KKFile进行预览
       const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
       window.open(url)
+    },
+    // 查看
+    handleDetail (record) {
+      this.$router.push({
+        path: '/businessSupport/questionDetail',
+        query: {
+          id: record.id,
+          canAnswer: 0
+        }
+      })
+    },
+    // 回答
+    handleAnswer (record) {
+      this.$router.push({
+        path: '/businessSupport/questionDetail',
+        query: {
+          id: record.id,
+          canAnswer: 1
+        }
+      })
     }
   }
 }
diff --git a/src/views/businessSupport/questionAnswerLibrary/modules/QuizModal.vue b/src/views/businessSupport/questionAnswerLibrary/modules/QuizModal.vue
index d5015ad5..37eb870d 100644
--- a/src/views/businessSupport/questionAnswerLibrary/modules/QuizModal.vue
+++ b/src/views/businessSupport/questionAnswerLibrary/modules/QuizModal.vue
@@ -10,58 +10,76 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('businessSupport.questionAnswer.classify')">
-          <a-select :placeholder="$t('pleaseSelect') + $t('businessSupport.questionAnswer.classify')"
-                    allowClear
-                    v-decorator.trim="[ 'level', validatorRules.level]">
-            <a-select-option :value="null" :key="-1">请选择</a-select-option>
-            <a-select-option :value="1">国内标准</a-select-option>
-            <a-select-option :value="2">海外标准</a-select-option>
-            <a-select-option :value="3">企业标准</a-select-option>
-            <a-select-option :value="4">其他问题</a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardNumber')">
-          <standard-model-selection
-            v-decorator.trim="[ 'standardNumber', validatorRules.standardNumber]"
-            :placeholder="$t('pleaseEnterOrSelect') + $t('standardNumber')"
-            @nameChange="standardNameChange"
-          />
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardName')">
-          <a-input disabled :placeholder="$t('pleaseEnter') + $t('standardName')"
-            v-decorator.trim="[ 'standardName', validatorRules.standardName]"/>
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('title')">
-          <a-input v-decorator.trim="[ 'title', validatorRules.title]"
-                   :placeholder="$t('pleaseEnter') + $t('title')"/>
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('project')">
-          <a-select :placeholder="$t('pleaseSelect') + $t('project')"
-                    allowClear
-                    v-decorator.trim="[ 'project', validatorRules.project]">
-            <a-select-option :value="null" :key="-1">请选择</a-select-option>
-            <a-select-option v-for="item in projectList" :value="item.id" :key="item.id">{{ item.projectName }}</a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('businessSupport.questionAnswer.quizTime')">
-          <a-date-picker
-            v-decorator.trim="[ 'quizTime', validatorRules.quizTime]"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            showTime
-          ></a-date-picker>
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('businessSupport.questionAnswer.questionDesc')">
-          <a-textarea
-            v-decorator.trim="[ 'questionDesc', validatorRules.questionDesc]"
-            :placeholder="$t('pleaseEnter')+$t('businessSupport.questionAnswer.questionDesc')"
-            :maxLength="500"
-            :rows="4" />
-          <j-upload v-decorator.trim="[ 'attach', validatorRules.attach]"
-                    isDownload>
-          </j-upload>
-        </a-form-item>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('businessSupport.questionAnswer.classify')">
+              <a-select :placeholder="$t('pleaseSelect') + $t('businessSupport.questionAnswer.classify')"
+                        allowClear
+                        v-decorator.trim="[ 'level', validatorRules.level]">
+                <a-select-option :value="null" :key="-1">请选择</a-select-option>
+                <a-select-option value="1">国内标准</a-select-option>
+                <a-select-option value="2">海外标准</a-select-option>
+                <a-select-option value="3">企业标准</a-select-option>
+                <a-select-option value="4">其他问题</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" v-if="['1', '2', '3'].includes(form.getFieldValue('level'))">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardNumber')">
+              <standard-model-selection
+                v-decorator.trim="[ 'standardNumber', validatorRules.standardNumber]"
+                :placeholder="$t('pleaseEnterOrSelect') + $t('standardNumber')"
+                :source="form.getFieldValue('level')"
+                :disabledSourceSearch="true"
+                @nameChange="standardNameChange"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" v-if="['1', '2', '3'].includes(form.getFieldValue('level'))">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardName')">
+              <a-input disabled :placeholder="$t('pleaseEnter') + $t('standardName')"
+                       v-decorator.trim="[ 'standardName', validatorRules.standardName]"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('title')">
+              <a-input v-decorator.trim="[ 'title', validatorRules.title]"
+                       :placeholder="$t('pleaseEnter') + $t('title')"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('project')">
+              <a-select :placeholder="$t('pleaseSelect') + $t('project')"
+                        allowClear
+                        v-decorator.trim="[ 'project', validatorRules.project]">
+                <a-select-option :value="null" :key="-1">请选择</a-select-option>
+                <a-select-option v-for="item in projectList" :value="item.id" :key="item.id">{{ item.projectName }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('businessSupport.questionAnswer.quizTime')">
+              <a-date-picker
+                v-decorator.trim="[ 'quizTime', validatorRules.quizTime]"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                showTime
+              ></a-date-picker>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.questionDesc')">
+              <a-textarea
+                v-decorator.trim="[ 'questionDesc', validatorRules.questionDesc]"
+                :placeholder="$t('pleaseEnter')+$t('businessSupport.questionAnswer.questionDesc')"
+                :maxLength="500"
+                :rows="4" />
+              <j-upload v-decorator.trim="[ 'attach', validatorRules.attach]"
+                        isDownload>
+              </j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
     </a-spin>
 
@@ -91,7 +109,15 @@ export default {
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 16 }
+        sm: { span: 18 }
+      },
+      longLabelCol: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      longWrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 20 }
       },
       validatorRules: {
         classify: {
diff --git a/src/views/businessSupport/questionAnswerLibrary/modules/AnswerPage.vue b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
similarity index 52%
rename from src/views/businessSupport/questionAnswerLibrary/modules/AnswerPage.vue
rename to src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
index 7c80530f..b5918432 100644
--- a/src/views/businessSupport/questionAnswerLibrary/modules/AnswerPage.vue
+++ b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
@@ -1,62 +1,79 @@
 <template>
-  <div class="answer-page">
-    <div class="answer-page-title">{{ model.title }}</div>
-    <div class="answer-page-second-title">
+  <div class="detail-page">
+    <div class="detail-page-title">{{ model.title }}</div>
+    <div class="detail-page-second-title">
       {{ $t('businessSupport.questionAnswer.poster') + '：' + model.orgCodeTxt + ' ' + model.poster }}
     </div>
-    <a-divider dashed/>
-    <div class="base-info-wrapper">
-      <a-row :gutter="24">
-        <a-col :span="4" class="base-info-title">{{ $t('standardNumOrName') }}</a-col>
-        <a-col :span="20" class="base-info-value"><a>{{ model.standardNumber + ' ' + model.standardName }}</a></a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="4" class="base-info-title">{{ $t('project') }}</a-col>
-        <a-col :span="20" class="base-info-value">{{ model.project }}</a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="4" class="base-info-title">{{ $t('businessSupport.questionAnswer.attach') }}</a-col>
-        <a-col :span="20" class="base-info-value"><a>{{ model.attach }}</a></a-col>
-      </a-row>
+    <div class="detail-page-part">
+      <div class="detail-page-part-form">
+        <!--  标准号/标准名称  -->
+        <div class="detail-page-part-form-item-large">
+          <label>{{ $t('standardNumOrName') }}</label>
+          <span>{{ model.standardNumber && model.standardName ? model.standardNumber + ' ' + model.standardName : global.emptyLine }}</span>
+        </div>
+        <!--  项目  -->
+        <div class="detail-page-part-form-item-large">
+          <label>{{ $t('project') }}</label>
+          <span>{{  model.project  || global.emptyLine }}</span>
+        </div>
+        <!--  附件  -->
+        <div class="detail-page-part-form-item-large-file">
+          <label>{{ $t('businessSupport.questionAnswer.attach') }}</label>
+          <span>{{  model.attach  || global.emptyLine }}</span>
+        </div>
+      </div>
     </div>
-    <a-divider dashed/>
     <!--  问题描述部分  -->
     <div class="question-desc-wrapper">
-      <p>{{ model.questionDesc }}</p>
+      <p class="question-desc">{{ model.questionDesc }}</p>
       <p class="right-bottom-p">
         <span class="time-span">{{ model.quizTime }}</span>
-        <span class="right-bottom-p-span">{{ answerArr.length }}个回复</span>
+        <span class="right-bottom-p-span">{{ answerArr.length + $t('businessSupport.questionAnswer.answerNum')}}</span>
       </p>
     </div>
     <!--  历史回答数据  -->
     <div v-for="(item, index) in answerArr" :key="index" class="answer-wrapper">
       <div class="left-user-info">
-        <a-avatar shape="square" :src="getAvatarView(item.avatar)" icon="user"/>
+        <a-avatar shape="square" :size="56" :src="getAvatarView(item.avatar)" icon="user"/>
         <p>{{ item.realname }}</p>
         <p>{{ item.orgCodeTxt }}</p>
       </div>
       <div class="right-answer-wrapper">
-        <p v-if="item.isTop" class="top-p">【置顶】</p>
+        <!--  是否是置顶  -->
+        <p v-if="item.isTop" class="top-p">{{ $t('businessSupport.questionAnswer.top') }}</p>
+        <!--  回答描述  -->
         <p :class="!item.isTop ? 'no-top-desc' : ''">{{ item.answerDesc }}</p>
         <p class="right-bottom-p">
           <span>{{ item.answerTime }}</span>
-          <a class="right-bottom-p-a" v-if="item.isTop">取消置顶</a>
-          <a class="right-bottom-p-a" v-else>设置为置顶</a>
-          <a class="right-bottom-p-a">删除</a>
+          <!--  置顶评论的操作按钮  -->
+          <template v-if="item.isTop">
+            <!--  取消置顶  -->
+            <a class="right-bottom-p-a">{{ $t('businessSupport.questionAnswer.cancelTop') }}</a>
+            <!--  删除 : 发帖人、评论人、有置顶权限的用户可以删除 ?? -->
+            <a class="right-bottom-p-a">{{ $t('delete') }}</a>
+          </template>
+          <!--  非置顶评论  -->
+          <template v-else>
+            <!--  设置为置顶  -->
+            <a class="right-bottom-p-a">{{ $t('businessSupport.questionAnswer.setTop') }}</a>
+            <!--  删除 : 发帖人、评论人、有置顶权限的用户可以删除,置顶的评论不允许删除，取消置顶后允许删除 ?? -->
+            <a class="right-bottom-p-a">{{ $t('delete') }}</a>
+          </template>
         </p>
       </div>
-    </div v-for="(item, index) in answerArr" :key="index">
+    </div>
     <!-- 回答区域 -->
-    <div class="answer-wrapper">
+    <div v-if="canAnswer === 1" class="answer-wrapper">
       <div class="left-user-info">
-        <a-avatar shape="square" :src="getAvatarView(currentUser.avatar)" icon="user"/>
+        <a-avatar shape="square" :size="56" :src="getAvatarView(currentUser.avatar)" icon="user"/>
         <p>{{ currentUser.realname }}</p>
         <p>{{ currentUser.orgCodeTxt }}</p>
       </div>
       <div class="right-answer-form-wrapper">
-        <p>回复问题</p>
-        <a-textarea v-model="answerDesc"></a-textarea>
-        <a-button class="submit-btn" type="primary">提交</a-button>
+        <p>{{ $t('businessSupport.questionAnswer.answerQuestion') }}</p>
+        <a-textarea v-model="answerDesc" :autoSize="{minRows: 4}" :maxLength="2000"></a-textarea>
+        <p class="answer-desc-num">{{ answerDesc.length }}/2000{{ $t('businessSupport.questionAnswer.word') }}</p>
+        <a-button class="submit-btn" type="primary" @click="submit">{{ $t('submit') }}</a-button>
       </div>
     </div>
   </div>
@@ -112,12 +129,14 @@ export default {
         realname: '',
         orgCodeTxt: ''
       },
-      answerDesc: ''
+      answerDesc: '',
+      canAnswer: false
     }
   },
   mounted () {
     const userInfo = Vue.ls.get(USER_INFO)
     this.currentUser = Object.assign({}, userInfo)
+    this.canAnswer = Number(this.$route.query.canAnswer)
   },
   methods: {
     getAvatarView (avatar) {
@@ -128,47 +147,71 @@ export default {
 </script>
 
 <style scoped lang="less">
-.answer-page {
-  padding: 24px;
-}
 
-.answer-page-title {
-  font-size: 20px;
-  font-family: PingFang SC-Medium, PingFang SC, sans-serif;
-  color: #1D2129;
-  font-weight: 600;
-  text-align: center;
-  margin-bottom: 24px;
-}
-
-.answer-page-second-title {
+// 二级标题
+.detail-page-second-title {
   font-size: 16px;
   text-align: center;
   font-weight: 550;
+  margin-bottom: 20px;
 }
-.base-info-wrapper {
-  font-size: 16px;
-  font-family: PingFang SC-Medium, PingFang SC, sans-serif;
-  .base-info-title {
-    font-weight: 530;
+.detail-page-part-form-item-large {
+  width: 100%;
+  display: flex;
+  margin: 0 16px 16px 0;
+
+  label {
+    width: 20%;
+    font-size: 16px;
+    font-family: PingFang SC-Regular, PingFang SC, sans-serif;
+    font-weight: 400;
+    color: #86909C;
+  }
+
+  span {
+    white-space: pre-wrap;
+    word-break: break-all;
+    font-size: 16px;
+    font-family: PingFang SC-Regular, PingFang SC, sans-serif;
     color: #1D2129;
   }
-  .base-info-value {
-    color: #1D2129;
+}
+.detail-page-part-form-item-large-file {
+  width: 100%;
+  display: flex;
+  margin: 0 16px 16px 0;
+
+  label {
+    width: 20%;
+    font-size: 16px;
+    font-family: PingFang SC-Regular, PingFang SC, sans-serif;
+    font-weight: 400;
+    color: #86909C;
+  }
+
+  a {
+    white-space: pre-wrap;
+    word-break: break-all;
+    font-size: 16px;
+    font-family: PingFang SC-Regular, PingFang SC, sans-serif;
   }
 }
 // 问题描述部分
 .question-desc-wrapper {
-  position: relative;
-  padding-bottom: 40px;
+  border-radius: 8px;
+  border: 1px solid #E5E6EB;
+  margin-bottom: 20px;
+  padding: 20px;
+  .question-desc {
+    font-size: 16px;
+  }
 }
 // 历史回答数据
 .answer-wrapper {
-  width: 100%;
-  //height: 100%;
-  border: 1px solid #1D2129;
+  border-radius: 8px;
+  border: 1px solid #E5E6EB;
+  margin-bottom: 20px;
   display: flex;
-  //flex: 1;
   .left-user-info {
     width: 300px;
     display: flex;
@@ -176,19 +219,26 @@ export default {
     align-items: center;
     justify-content: center;
     background: rgb(247, 248, 250);
+    padding: 20px 0 5px 0;
   }
   .right-answer-wrapper {
-    position: relative;
-    padding: 20px 10px 40px 10px;
+    width: 100%;
+    padding: 20px 10px 20px 10px;
     box-sizing: border-box;
   }
   .right-answer-form-wrapper {
-    padding: 20px;
+    padding: 20px 10px;
     width: 100%;
+    box-sizing: border-box;
     .submit-btn {
       margin-top: 20px;
     }
   }
+  .answer-desc-num {
+    text-align: right;
+    margin-top: 5px;
+    margin-bottom: 0;
+  }
   .top-p {
     color: #D52C26;
   }
@@ -199,11 +249,9 @@ export default {
 // 右下角的时间和按钮区域
 .right-bottom-p {
   height: 20px;
-  display: flex;
-  width: auto;
-  position: absolute;
-  right: 10px;
-  bottom: 0;
+  text-align: right;
+  padding-right: 8px;
+  margin-bottom: 0;
   .time-span {
     color: #86909C;
   }
diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue
index 3ef4c97e..151fda35 100644
--- a/src/views/enterpriseStandardLibrary/check/CheckList.vue
+++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue
@@ -67,7 +67,7 @@
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'enterpriseStandardLibrary:check:search'">{{ $t('query') }}</a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+            <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
         </a-row>
@@ -198,7 +198,7 @@ export default {
           title: this.$t('serialNumber'),
           dataIndex: '',
           key: 'rowIndex',
-          width: 60,
+          width: 80,
           align: 'center',
           customRender: function (t, r, index) {
             return parseInt(index) + 1
@@ -300,7 +300,7 @@ export default {
         list: '/enterprise/inspect/page',
         exportXlsUrl: '/enterprise/inspect/exportData',
         exportPostponeDataUrl: '/enterprise/inspect/exportDataWithDelay', // 导出延期数据
-        exportRectificationPlanUrl: '' // 导出整改计划
+        exportRectificationPlanUrl: '/enterprise/inspect/exportDataRectifyPlan' // 导出整改计划
       },
       operationList: [
         {
diff --git a/src/views/enterpriseStandardLibrary/plan/PlanList.vue b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
index 853392f6..4e3e6736 100644
--- a/src/views/enterpriseStandardLibrary/plan/PlanList.vue
+++ b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
@@ -119,7 +119,7 @@
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'enterpriseStandardLibrary:plan:search'">{{ $t('query') }}</a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+            <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
         </a-row>
diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
index a3b4442f..1290463b 100644
--- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
+++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
@@ -38,7 +38,7 @@
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'enterpriseStandardLibrary:publicize:search'">{{ $t('query') }}</a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+            <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
         </a-row>
@@ -177,7 +177,8 @@ export default {
       ],
       url: {
         list: '/enterprise/declare/page',
-        exportXlsUrl: '/enterprise/declare/exportData'
+        exportXlsUrl: '/enterprise/declare/exportData',
+        exportZipUrl: '/enterprise/declare/exportDataWithFile'
       }
     }
   },
diff --git a/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue b/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue
index 4ae6fd07..10dd06d6 100644
--- a/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue
+++ b/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue
@@ -27,7 +27,7 @@
 
           <div style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
             <a-button type="primary" @click="searchQuery" icon="search" v-has="'enterpriseStandardLibrary:reviewMeeting:search'">{{ $t('query') }}</a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+            <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
         </a-row>
@@ -100,7 +100,7 @@ export default {
           title: this.$t('serialNumber'),
           dataIndex: '',
           key: 'rowIndex',
-          width: 60,
+          width: 80,
           align: 'center',
           customRender: function (t, r, index) {
             return parseInt(index) + 1
diff --git a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
index d2778b95..3aac0a93 100644
--- a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
+++ b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
@@ -43,7 +43,7 @@
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'enterpriseStandardLibrary:recheckPlan:search'">{{ $t('query') }}</a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+            <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
         </a-row>
@@ -110,7 +110,7 @@ export default {
           title: this.$t('serialNumber'),
           dataIndex: '',
           key: 'rowIndex',
-          width: 60,
+          width: 80,
           align: 'center',
           customRender: function (t, r, index) {
             return parseInt(index) + 1
diff --git a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
index bfb83bde..e8466d37 100644
--- a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
+++ b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
@@ -23,9 +23,9 @@
             </a-form-item>
           </a-col>
 
-          <div style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+          <div style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
             <a-button type="primary" @click="searchQuery" icon="search" v-has="'sys:friendshipLink:search'">{{ $t('query') }}</a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+            <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
         </a-row>
@@ -88,7 +88,7 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           align: 'center',
-          width: 60,
+          width: 80,
           customRender: function (t, r, index) {
             return parseInt(index) + 1
           }
diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue
index 4e36f9af..0a7a428f 100644
--- a/src/views/system/internalWorkGroup/WorkingGroupList.vue
+++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue
@@ -96,7 +96,7 @@
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
               <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px" v-has="'sys:innerWorkingGroup:search'">{{ $t('query') }}</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+              <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
             </div>
 
           </a-row>