|
|
@@ -81,6 +81,7 @@
|
|
|
:default-sort="{ prop: 'createTime', order: 'descending' }"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
+ <!-- :default-sort="{ prop: 'createTime', order: 'descending' }" -->
|
|
|
<el-table-column
|
|
|
type="selection"
|
|
|
width="55"
|
|
|
@@ -152,10 +153,11 @@
|
|
|
prop="createTime"
|
|
|
label="创建时间"
|
|
|
width="160"
|
|
|
- sortable
|
|
|
show-overflow-tooltip
|
|
|
align="center"
|
|
|
+ sortable
|
|
|
>
|
|
|
+ <!-- sortable -->
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{ scope.row.createTime.split(' ')[0] }}</div>
|
|
|
<div>{{ scope.row.createTime.split(' ')[1] }}</div>
|
|
|
@@ -163,7 +165,6 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- v-if="$permission.isAdminOrProvince()"
|
|
|
label="操作"
|
|
|
width="240"
|
|
|
fixed="right"
|
|
|
@@ -240,7 +241,7 @@
|
|
|
<el-dialog
|
|
|
:title="dialogTitle"
|
|
|
:visible.sync="dialogVisible"
|
|
|
- width="70%"
|
|
|
+ width="75%"
|
|
|
:close-on-click-modal="false"
|
|
|
>
|
|
|
<el-form
|
|
|
@@ -1159,6 +1160,16 @@
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
+ // 监听目录数据变化,数据加载完成后处理回显
|
|
|
+ catalogListOptions: {
|
|
|
+ handler(newVal) {
|
|
|
+ if (newVal && newVal.length > 0) {
|
|
|
+ // 数据加载完成后,重新处理value
|
|
|
+ this.batchGetCatalogNames()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ immediate: true,
|
|
|
+ },
|
|
|
indicatorTableData: {
|
|
|
handler(newVal) {
|
|
|
if (this.radioType === 'other' && this.selectedTemplateId) {
|
|
|
@@ -1380,7 +1391,6 @@
|
|
|
if (res.rows.length > 0) {
|
|
|
this.tableData = res.rows || []
|
|
|
this.pagination.total = res.total || 0
|
|
|
- this.batchGetCatalogNames()
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -1520,7 +1530,7 @@
|
|
|
this.generateFromSurveyTemplate()
|
|
|
} else if (this.contentEditForm.createmode == '2') {
|
|
|
if (!this.contentEditForm.createtemplateid1) {
|
|
|
- this.$message.error('请选择成本调查表模板')
|
|
|
+ this.$message.error('请选择历史核定模板')
|
|
|
return
|
|
|
}
|
|
|
this.generateFromHistoryTemplate()
|