diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index 4a4b2d41c..ff47ee580 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -6654,7 +6654,7 @@ var PDFPageView = function () { watermark_x_space: 40,//水印x轴间隔 watermark_y_space: 50,//水印y轴间隔 watermark_color: 'rgba(232,232,240)',//水印字体颜色 - watermark_alpha: 0.3,//水印透明度 + watermark_alpha: 0.4,//水印透明度 watermark_fontsize: '40px',//水印字体大小 watermark_font: '微软雅黑',//水印字体 watermark_width: 120,//水印宽度 diff --git a/src/api/process.js b/src/api/process.js index 979121fa1..873a4600a 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -170,6 +170,15 @@ export function taskDel (data) { params: data }) } +//模板下载 +export function downloadStatus(data) { + return axios({ + url: '/api/importWkExcel/exportqbzxdjh', + method: 'post', + responseType: 'blob', + params: data + }) +} // 整改流程 详情查询nonconformity export function getNonconformity (data) { return axios({ diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 69521ed19..179a6047d 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -3179,12 +3179,14 @@ export default { location['child1'] = childList } } - for (let i = 0; i < displayLocation.length; i++) { // sss11 - if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){ - const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== ''); - if(childList.length === 0){ + if((displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件') || !dynamicFormField){ + let childList = [] + if(displayLocation[i].child){ + childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== ''); + } + if(displayLocation[i].label !== '基础信息' && childList.length === 0){ displayLocation.splice(i,1) } } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 205b292b7..1da04c431 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -588,7 +588,7 @@ export default { if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){ this.routerBussProStand() } - if (this.$route.query.bpnId !== '') { + if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 0ee9eec88..37bac75f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -586,7 +586,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; let Base64 = require('js-base64').Base64; @@ -2450,6 +2450,14 @@ this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { _this: this }, res => { + if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.submitLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 5a7ecc5ee..ecfa8e994 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2408,7 +2408,7 @@ this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { _this: this }, res => { - if (this.$route.query.bpnId !== '') { + if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 69a911291..e0ba7e6fa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -54,7 +54,7 @@
新增 导入 - 模板下载 + 模板下载 批量删除
@@ -342,11 +342,11 @@