ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 修改bug77937,77958,78028,78031

Browse Source
This commit is contained in:
lideqin
2023-11-02 11:24:27 +08:00
parent 1d5a739b52
commit 2c88bfdc57
7 changed files with 90 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/lang/businessSupport/en.js
+3 -1
View File
@@ -19,6 +19,8 @@ module.exports = {
setTop: 'Set To Top', setTop: 'Set To Top',
answerQuestion: 'reply to a question', answerQuestion: 'reply to a question',
word: 'word', word: 'word',
pleaseEnterAnswerDesc: '请输入回答描述' pleaseEnterAnswerDesc: '请输入回答描述',
answerQuestionTitle: '回答问题',
questionDetail: '问题详情'
} }
} }
src/common/lang/businessSupport/zh.js
+4 -2
View File
@@ -1,7 +1,7 @@
module.exports = { module.exports = {
// 标准化活动 // 标准化活动
standardizationActivity: { standardizationActivity: {
nodeName: '节点名称', // 节点名称 nodeName: '节点名称' // 节点名称
}, },
// 问答库 // 问答库
questionAnswer: { questionAnswer: {
@@ -19,7 +19,9 @@ module.exports = {
setTop: '设置为置顶', setTop: '设置为置顶',
answerQuestion: '回复问题', answerQuestion: '回复问题',
word: '字', word: '字',
pleaseEnterAnswerDesc: '请输入回答描述' pleaseEnterAnswerDesc: '请输入回答描述',
answerQuestionTitle: '回答问题',
questionDetail: '问题详情'
}, },
// 征求意见 // 征求意见
src/components/customField/Search.vue
+60 -14
View File
@@ -50,14 +50,6 @@
<!-- v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>--> <!-- v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </template>--> <!-- </template>-->
<!-- 字典多选框 -->
<!-- <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">-->
<!-- <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
<!-- :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
<!-- :triggerChange="false" :dictCode="item.dict_field"/>-->
<!-- </a-form-item>-->
<!-- </template>-->
<!-- 日期区间 --> <!-- 日期区间 -->
<template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)"> <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -68,7 +60,7 @@
</a-form-item> </a-form-item>
</template> </template>
<!-- 字典单选框 --> <!-- 字典单选框 -->
<template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value"> <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="queryParam[item.dbFieldName]" <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
@@ -76,8 +68,17 @@
:triggerChange="false" :dictCode="item.dictField" /> :triggerChange="false" :dictCode="item.dictField" />
</a-form-item> </a-form-item>
</template> </template>
<!-- 字典多选框 -->
<template v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-multi-select-tag v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"
:type="'select'" :maxTagCount="1"
:triggerChange="false" :dictCode="item.dictField"/>
</a-form-item>
</template>
<!-- 组织机构选择 --> <!-- 组织机构选择 -->
<template v-else-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)"> <template v-else-if="item.fieldShowType === FieldType.ORGAN_SINGLE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select <a-tree-select
tree-node-filter-prop="title" tree-node-filter-prop="title"
@@ -92,6 +93,24 @@
/> />
</a-form-item> </a-form-item>
</template> </template>
<!-- 组织机构多选 -->
<template v-else-if="item.fieldShowType === FieldType.ORGAN_MORE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
tree-node-filter-prop="title"
v-model="queryParam[item.dbFieldName]"
:maxTagCount="1"
:show-search="true"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input"
style="width: 100%"
:tree-data="categoryTreeList"
:placeholder="$t('pleaseSelect') + item.dbFieldTxt"
treeCheckable
treeCheckStrictly
/>
</a-form-item>
</template>
<!-- 年份选择 --> <!-- 年份选择 -->
<template <template
v-if="item.fieldShowType === FieldType.YEAR_PICKER.value"> v-if="item.fieldShowType === FieldType.YEAR_PICKER.value">
@@ -147,8 +166,8 @@
v-model="queryParam[item.dbFieldName]"></a-input> v-model="queryParam[item.dbFieldName]"></a-input>
</a-form-item> </a-form-item>
</template> </template>
<!-- 组织机构选择 --> <!-- 组织机构单选 -->
<template v-else-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)"> <template v-else-if="item.fieldShowType === FieldType.ORGAN_SINGLE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select <a-tree-select
tree-node-filter-prop="title" tree-node-filter-prop="title"
@@ -163,6 +182,24 @@
/> />
</a-form-item> </a-form-item>
</template> </template>
<!-- 组织机构多选 -->
<template v-else-if="item.fieldShowType === FieldType.ORGAN_MORE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
tree-node-filter-prop="title"
v-model="queryParam[item.dbFieldName]"
:maxTagCount="1"
:show-search="true"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input"
style="width: 100%"
:tree-data="categoryTreeList"
:placeholder="$t('pleaseSelect') + item.dbFieldTxt"
treeCheckable
treeCheckStrictly
/>
</a-form-item>
</template>
<!-- 日期区间选择器 --> <!-- 日期区间选择器 -->
<template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)"> <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -171,8 +208,8 @@
@change="onChange(item.dbFieldName)"></a-range-picker> @change="onChange(item.dbFieldName)"></a-range-picker>
</a-form-item> </a-form-item>
</template> </template>
<!-- 字典选择器 --> <!-- 字典单选 -->
<template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value"> <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="queryParam[item.dbFieldName]" <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt" :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
@@ -180,6 +217,15 @@
:triggerChange="false" :dictCode="item.dictField" /> :triggerChange="false" :dictCode="item.dictField" />
</a-form-item> </a-form-item>
</template> </template>
<!-- 字典多选框 -->
<template v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">
<a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-multi-select-tag v-model="queryParam[item.dbFieldName]"
:placeholder="$t('pleaseSelect')+item.dbFieldTxt"
:type="'select'" :maxTagCount="1"
:triggerChange="false" :dictCode="item.dictField"/>
</a-form-item>
</template>
<!-- 年份选择 --> <!-- 年份选择 -->
<template <template
v-if="item.fieldShowType === FieldType.YEAR_PICKER.value"> v-if="item.fieldShowType === FieldType.YEAR_PICKER.value">
src/components/dict/JMultiSelectTag.vue
+1
View File
@@ -14,6 +14,7 @@
optionFilterProp="children" optionFilterProp="children"
:filterOption="filterOption" :filterOption="filterOption"
allowClear allowClear
v-bind="$attrs"
:options="dictOptions"> :options="dictOptions">
</a-select> </a-select>
src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
+14 -2
View File
@@ -1,5 +1,5 @@
<template> <template>
<div class="detail-page"> <internal-detail-page :title="pageTitle" :loading="loading">
<div class="detail-page-title">{{ model.title }}</div> <div class="detail-page-title">{{ model.title }}</div>
<div class="detail-page-second-title"> <div class="detail-page-second-title">
<!-- todo: 发帖人部门没有返回 --> <!-- todo: 发帖人部门没有返回 -->
@@ -105,7 +105,7 @@
<img v-show="image" :src="imageUrl"> <img v-show="image" :src="imageUrl">
</div> </div>
</div> </div>
</div> </internal-detail-page>
</template> </template>
<script> <script>
@@ -115,6 +115,7 @@ import { getFileAccessHttpUrl, downloadFile } from '@/api/manage'
import { getQuizById, answerQuiz, setOrCancelTop, deleteAnswer } from '@/api/businessSupport' import { getQuizById, answerQuiz, setOrCancelTop, deleteAnswer } from '@/api/businessSupport'
import { getFileInfo } from '@/api/api' import { getFileInfo } from '@/api/api'
import { previewPdf } from '@/utils/previewPdf' import { previewPdf } from '@/utils/previewPdf'
import InternalDetailPage from '@/components/InternalDetailPage'
// 支持预览的文件后缀 // 支持预览的文件后缀
const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'mp3', 'mp4', 'flv'] const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'mp3', 'mp4', 'flv']
@@ -124,8 +125,11 @@ const Base64 = require('js-base64').Base64
export default { export default {
name: 'AnswerPage', name: 'AnswerPage',
components: { InternalDetailPage },
data () { data () {
return { return {
loading: false,
pageTitle: '',
model: {}, model: {},
answerArr: [], answerArr: [],
fileList: [], fileList: [],
@@ -147,10 +151,16 @@ export default {
this.userInfo = userInfo this.userInfo = userInfo
this.currentUser = Object.assign({}, userInfo) this.currentUser = Object.assign({}, userInfo)
this.canAnswer = Number(this.$route.query.canAnswer) this.canAnswer = Number(this.$route.query.canAnswer)
if (this.canAnswer === 1) {
this.pageTitle = this.$t('businessSupport.questionAnswer.answerQuestionTitle')
} else {
this.pageTitle = this.$t('businessSupport.questionAnswer.questionDetail')
}
}, },
methods: { methods: {
// 初始化获取数据信息 // 初始化获取数据信息
initData (id) { initData (id) {
this.loading = true
getQuizById({ id: id }).then(res => { getQuizById({ id: id }).then(res => {
if (res.success) { if (res.success) {
this.model = Object.assign({}, res.result) this.model = Object.assign({}, res.result)
@@ -167,6 +177,8 @@ export default {
} }
this.answerArr = this.model.answerList this.answerArr = this.model.answerList
} }
}).finally(() => {
this.loading = false
}) })
}, },
// 获取头像 // 获取头像
src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
+1 -1
View File
@@ -27,7 +27,7 @@
</a-range-picker> </a-range-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus">、 <template v-if="toggleSearchStatus">
<!-- 宣贯人 --> <!-- 宣贯人 -->
<a-col :span="6"> <a-col :span="6">
<a-form-item :label="$t('enterpriseStandardLibrary.publicize.publicist')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('enterpriseStandardLibrary.publicize.publicist')" :labelCol="labelCol" :wrapperCol="wrapperCol">
src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
+7 -5
View File
@@ -123,13 +123,15 @@
</template> </template>
<!-- 没有编辑删除权限 --> <!-- 没有编辑删除权限 -->
<template v-else> <template v-else>
<a v-for="(operation, index) in operationList.slice(0, operateMaxNum)" :key="index" @click="operationClick(operation,record)"> <template v-if="operationList.find(item => item.text === $t('enterpriseStandardLibrary.standard.collection'))">
<template v-if="operation.text === $t('enterpriseStandardLibrary.standard.collection')"> <a @click="operationClick(operationList.find(item => item.text === $t('enterpriseStandardLibrary.standard.collection')),record)">
<i class="iconfont icon-star1" v-show="record.collectionFlag" /> <i class="iconfont icon-star1" v-show="record.collectionFlag" />
<i class="iconfont icon-star" v-show="!record.collectionFlag" /> <i class="iconfont icon-star" v-show="!record.collectionFlag" />
</template> </a>
</a> </template>
<a-divider v-if="operationList.find(item => item.text === $t('share'))" type="vertical" /> <a-divider v-if="operationList.find(item => item.text === $t('share')) &&
operationList.find(item => item.text === $t('enterpriseStandardLibrary.standard.collection'))"
type="vertical" />
<template v-if="operationList.find(item => item.text === $t('share'))"> <template v-if="operationList.find(item => item.text === $t('share'))">
<template v-for="(operation, index) in operationList.slice(operateMaxNum)"> <template v-for="(operation, index) in operationList.slice(operateMaxNum)">
<a :key="index" @click="operationClick(operation,record)" v-if="operation.text === $t('share')"> <a :key="index" @click="operationClick(operation,record)" v-if="operation.text === $t('share')">