Merge branch 'master' into 标准拆分译文变更
# Conflicts: # src/common/lang/en-us.js # src/common/lang/zh-cn.js # src/views/documentTool/documentSplit/modules/SplitAddForm.vue # src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
This commit is contained in:
@@ -48,19 +48,19 @@
|
||||
<i class="iconfont icon-shanchu_" />
|
||||
</a-button>
|
||||
<!--节点上移,是否可以上移在树形数据中应该有字段标识-->
|
||||
<a-button icon="up"
|
||||
v-if="record.pid"
|
||||
class="tree-operate-node-btn"
|
||||
@click.stop="orgMoveUp(record)"
|
||||
v-has="'split:sarFileSplitMenu:moveUp'">
|
||||
</a-button>
|
||||
<!--<a-button icon="up"-->
|
||||
<!-- v-if="record.pid"-->
|
||||
<!-- class="tree-operate-node-btn"-->
|
||||
<!-- @click.stop="orgMoveUp(record)"-->
|
||||
<!-- v-has="'split:sarFileSplitMenu:moveUp'">-->
|
||||
<!--</a-button>-->
|
||||
<!--节点下移,是否可以下移在树形数据中应该有字段标识-->
|
||||
<a-button icon="down"
|
||||
v-if="record.pid"
|
||||
class="tree-operate-node-btn"
|
||||
@click.stop="orgmoveDown(record)"
|
||||
v-has="'split:sarFileSplitMenu:moveDown'">
|
||||
</a-button>
|
||||
<!--<a-button icon="down"-->
|
||||
<!-- v-if="record.pid"-->
|
||||
<!-- class="tree-operate-node-btn"-->
|
||||
<!-- @click.stop="orgmoveDown(record)"-->
|
||||
<!-- v-has="'split:sarFileSplitMenu:moveDown'">-->
|
||||
<!--</a-button>-->
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -243,6 +243,8 @@ export default {
|
||||
mixins: [ConfigurableTableMixin],
|
||||
data () {
|
||||
return {
|
||||
// 导入的最大大小
|
||||
importMaxSize: 20,
|
||||
StandardSource,
|
||||
data: [],
|
||||
loading: false, // 提交的加载
|
||||
@@ -373,7 +375,8 @@ export default {
|
||||
this.menuId = this.selectedKeys[0]
|
||||
this.uploadData = {
|
||||
menuId: this.menuId,
|
||||
infoId: this.infoId
|
||||
infoId: this.infoId,
|
||||
standardClass: this.$route.query.standardClass
|
||||
}
|
||||
this.filters.info_id = this.infoId
|
||||
this.filters.menu_id = this.menuId
|
||||
|
||||
Reference in New Issue
Block a user