diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue index d40db75a..586d4b32 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue @@ -1,10 +1,3 @@ - - - - - - - @@ -250,14 +249,13 @@ import columnList from './columnList' import { thousandsFormat } from "@/components/Generator/utils/index" import SuperQuery from '@/components/SuperQuery' import superQueryJson from './superQueryJson' -import SaleOrder from '@/views/scm/saleCenter/saleOrder/form.vue' export default { components: { FlowBox, SaleFlowBox, - ExportBox, ToFormDetail, SuperQuery, SaleOrder + ExportBox, ToFormDetail, SuperQuery }, data() { @@ -391,26 +389,6 @@ export default { }) }, methods: { - createSaleOrder() { - if (!this.multipleSelectionItem.length) { - this.$message({ - type: 'error', - message: '请选择一条数据', - duration: 1500, - }) - return - } - const data = this.multipleSelectionItem - this.saleOrderVisible = true - this.$nextTick(() => { - this.$refs.SaleOrder.init(data) - }) - // this.$message({ - // type: 'error', - // message: '暂未开放', - // duration: 1500, - // }) - }, toDetail(defaultValue, modelId) { if (!defaultValue) return getConfigData(modelId).then(res => { @@ -696,7 +674,7 @@ export default { this.jnpf.downloadFile(res.data.url) this.$refs.ExportBox.visible = false this.exportBoxVisible = false - }) + }) }, search() { this.listQuery.currentPage = 1 @@ -710,7 +688,7 @@ export default { let data = { id: row.id, flowId: row.flowId || this.flowList[0].id, - opType: flowState ? 0 : '-1', + opType: flowState ? 0 : '-1', status: flowState } this.flowVisible = true diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue index a60ced74..4b5699cb 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue @@ -207,6 +207,7 @@ export default { flowVisible: false, flowListVisible: false, flowList: [], + deliveryFlowList: [], exportBoxVisible: false, receiptTypeOptions: [{ "fullName": "采购收货", "id": "1" }], receiptTypeProps: { "label": "fullName", "value": "id" }, @@ -253,6 +254,15 @@ export default { this.$router.push('/404'); }) }) + getFormById("1760911763504566273").then(res1 => { + let deliveryFlowId = res1.data && res1.data.id + getFlowList(deliveryFlowId, '1').then(res2 => { + this.deliveryFlowList = res2.data + }).catch((e) => { + this.$message({ type: 'error', message: e.message }); + this.$router.push('/404'); + }) + }) }, methods: { createDeliveryOrder() { @@ -264,15 +274,27 @@ export default { }) return } - // const data = this.multipleSelectionItem - // this.saleOrderVisible = true - // this.$nextTick(() => { - // this.$refs.SaleOrder.init(data) - // }) - this.$message({ - type: 'error', - message: '暂未开放', - duration: 1500, + const selectData = this.multipleSelectionItem + if (!this.deliveryFlowList.length) { + this.$message({ type: 'error', message: '流程不存在' }); + } else if (this.deliveryFlowList.length === 1) { + this.selectFlow1(this.deliveryFlowList[0], selectData) + } else { + this.flowListVisible = true + } + }, + selectFlow1(item, selectData) { + let data = { + id: '', + formType: 1, + flowId: item.id, + opType: '-1', + selectData: selectData + } + this.flowListVisible = false + this.flowVisible = true + this.$nextTick(() => { + this.$refs.FlowBox.init(data) }) }, toDetail(defaultValue, modelId) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue index 11b51109..26a285bb 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue @@ -1,10 +1,3 @@ - - - - - - -