-
{{ $t('countersign') }}
+
{{ $t('countersign') }}
{{ $t('turnTo') }}
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
index 22d747f..d0d9eaf 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
@@ -73,7 +73,7 @@
import SplitClauseDetail from '@views/documentTool/documentSplit/modules/SplitClauseDetail'
import InterpretationClauseTableModal
from '@views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal'
-import { filterObj, randomUUID } from '@/utils/util'
+import { randomUUID } from '@/utils/util'
import UserSelectModal from '@comp/selection/UserSelectModal'
import { downFile } from '@api/manage'
import { StandardInterpretationNodes } from '@/enums/commonEnums'
@@ -128,6 +128,12 @@ export default {
type: Boolean,
default: false,
required: false
+ },
+ // 标准信息
+ standardInfo: {
+ type: Object,
+ default: () => ({}),
+ required: false
}
},
data () {
@@ -631,8 +637,13 @@ export default {
},
// 导出
handleExport (fileName, fileSuffix = '.xlsx') {
- if (!fileName || typeof fileName !== 'string') {
- fileName = '导出文件'
+ const { standardNumber, standardName } = this.standardInfo || {}
+ if (this.isDistribute) {
+ // 分发：编号 + 名称 + 解读分发
+ fileName = `${standardNumber} ${standardName}-解读分发`
+ } else {
+ // 不分发和汇总：编号 + 名称 + 解读表
+ fileName = `${standardNumber} ${standardName}-解读表`
}
const param = {
projectId: this.$route.query.projectId,
@@ -642,18 +653,19 @@ export default {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
param.selections = this.selectedRowKeys.join(',')
}
- console.log('导出参数', param)
+ console.log('导出参数', param, fileName)
// 加一个大的提示
const modalLoading = this.$info({
- title: '提示',
- content:
正在导出，请稍候 ,
+ title: this.$t('tips'),
+ content:
{this.$t('exportTip')} ,
keyboard: false,
// 不显示 知道了 按钮
okButtonProps: {
style: 'display: none'
}
})
- let url = ''
+ // 汇总节点也用不分发的导出
+ let url = this.url.exportUnDistribute
// 解读人分发节点
if (this.isMainInterpreterDistribute) {
// 根据是否分发选择对应的接口
@@ -661,7 +673,7 @@ export default {
}
downFile(url, param).then((data) => {
if (!data) {
- this.$message.warning('文件下载失败')
+ this.$message.warning(this.$t('fileDownloadFail'))
return
}
if (typeof window.navigator.msSaveBlob !== 'undefined') {
@@ -725,7 +737,7 @@ export default {
*/
editCallback (formData) {
// 过滤没有值的字段
- const form = filterObj(formData)
+ const form = formData
// 有id就是编辑，没有就是批量编辑
if (formData[this.rowKey]) {
const row = this.dataSource.find(item => item[this.rowKey] === formData[this.rowKey])
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
index a2ce7f8..5250d09 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
@@ -303,8 +303,15 @@ export default {
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
+ // 是否与上一版相同(多个值就不回显)
+ if (!this.model.isSameAsPrevVersion || this.model.isSameAsPrevVersion.split(',').length > 1) {
+ delete this.model.isSameAsPrevVersion
+ }
+ // 专业领域
if (typeof this.model.domainArea === 'string' && this.model.domainArea.length) {
this.model.domainArea = this.model.domainArea.split(',').map(item => ({ value: item }))
+ } else {
+ this.model.domainArea = []
}
this.form.setFieldsValue(this.model)
})
@@ -319,6 +326,7 @@ export default {
if (Array.isArray(formData.domainArea)) {
formData.domainArea = formData.domainArea.map(item => item.value).join(',')
}
+ console.log(formData)
this.$emit('ok', formData)
this.close()
}
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
index 6cd110e..1b14f72 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
@@ -3,8 +3,11 @@
{{ $t('dispatchInformation') }}
-
-
+
+
@@ -164,4 +167,15 @@ export default {
.mb-20 {
margin-bottom: 20px;
}
+.prc-form {
+ /deep/ .ant-form-item-label {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-right: 16px;
+ }
+ /deep/ .user-organ-wrap {
+ height: 40px;
+ }
+}
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue
index 3f85ca3..12d5a22 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue
@@ -4,7 +4,7 @@
{{ $t('dispatchInformation') }}
-
+
@@ -119,4 +119,16 @@ export default {
.mb-20 {
margin-bottom: 20px;
}
+
+.prc-form {
+ /deep/ .ant-form-item-label {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin-right: 16px;
+ }
+ /deep/ .user-organ-wrap {
+ height: 40px;
+ }
+}
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
index 924bffd..bbc3d72 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
@@ -20,7 +20,7 @@