diff --git a/package.json b/package.json index 2ce7031..bfa1726 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "echarts": "^5.0.0", "element-resize-detector": "^1.2.4", "element-ui": "2.13.2", + "exceljs": "^4.4.0", "html2canvas": "^1.4.1", "js-cookie": "2.2.0", "less": "^3.13.1", @@ -40,7 +41,8 @@ "vue-router": "3.0.6", "vuex": "3.1.0", "vuex-persistedstate": "^4.1.0", - "wangeditor": "^4.7.12" + "wangeditor": "^4.7.12", + "xlsx": "^0.18.5" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.4", diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index 507fc14..79e628c 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -2219,7 +2219,7 @@ export default { url += row.join_last_flow_id break; case "other": - url += row.other_flow_id + url += row.other_flow_id || row.purchase_last_flow_id || row.req_last_flow_id break; default: url = `${process.env.VUE_APP_OUT_URL}/flow/list/todo` @@ -2898,9 +2898,10 @@ export default { } } else { if (item.flow_mod_id) { - //非采购事前流程 - flowStatus["other"].setStatus(item.other_flow_status??1) - if (item.other_flow_status === 1 || !item.other_flow_status) { + //非采购事前流程(other_flow_status 可能为空字符串,回退 req_status) + const otherStatus = item.other_flow_status || item.req_status || 1 + flowStatus["other"].setStatus(otherStatus) + if (otherStatus === 1) { flowStatus["other"].setExecutable(true) } } @@ -2909,7 +2910,7 @@ export default { flowStatus["zhifu"].setStatus(1) //最后一笔没付完 if ( - (item.is_purchase === 0 && item.other_flow_status === 3) || + (item.is_purchase === 0 && (item.other_flow_status === 3 || item.req_status === 3)) || (!item.is_contract && !item.is_substitute && item.purchase_status === 3) || (item.purchase_way?.value === "网上商城" && item.purchase_status === 3) || item.status === 2 || diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue index 4ce4ec8..0be1d2a 100644 --- a/src/views/preview/index.vue +++ b/src/views/preview/index.vue @@ -4,11 +4,58 @@