diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index f759deef8..93963384a 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -437,8 +437,10 @@
1.导入的文档是zip格式
2.图片为jpg、jpeg、png、gif格式
- 3.文档中的图片,在导出excel中以链接的形式展示,点击链接跳转到本地指定的文件
- 4.文档中的表格,在导出excel中以链接的形式展示,点击链接跳转到指定的sheet页面
+ 3.文档中的图片,在导出Excel中以链接的形式展示,点击链接跳转到本地指定的文件
+ 4.导入时,表格Sheet页名称保持一致即可,无需使用超链接。
+ 5.导入时,表格Sheet页中的表格需要遵循最左原则,即由第一行第一列开始。
+ 6.文档中的表格,在导出Excel中以链接的形式展示,点击链接跳转到指定的Sheet页面。
知道了 @@ -888,7 +890,7 @@ export default { } }) } else { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoSplitPage', { page: this.conditionForm.page, pageSize: this.conditionForm.pageSize, standNumber: this.conditionForm.numberName, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 1de64f30b..02aa9e5df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -461,7 +461,7 @@ export default { // this.standinfoList.push(item) // } // }) - this.total = this.standinfoList.length + this.total = res.data.count this.$nextTick(()=>{ this.$refs.selection.doLayout(); }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 241d95d77..cf41a8be1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -480,7 +480,7 @@ export default { // this.standinfoList.push(item) // } // }) - this.total = this.standinfoList.length + this.total = res.data.count this.$nextTick(()=>{ this.$refs.selection.doLayout(); }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index b5127e596..0f0e15e16 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -430,6 +430,12 @@ export default { break } this.qbfsForm = item.qbfsForm || item + if(!this.qbfsForm.LXD || this.qbfsForm.LXD == ''){ + this.qbfsForm.LXD = this.qbfsForm.lxd + } + if(!this.qbfsForm.LXDName || this.qbfsForm.LXDName == ''){ + this.qbfsForm.LXDName = this.qbfsForm.lxdName + } // this.isTrue = false // this.$nextTick(()=>{ // this.isTrue = true