@@ -15,13 +8,13 @@
-
+
-
+
+
+
- {{ scope.row.documentType}}
+ {{ scope.row.documentType1}}
-
+
+
+ {{ scope.row.documentStatus1}}
+
-
+
-
+
+
+
+
+ {{ scope.row.returnCargoWay1}}
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
等待审核
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
index 705868aa..88a02671 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
@@ -1188,7 +1188,9 @@ export default {
}
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
- mounted() { },
+ mounted() {
+ this.initPurchaseData();
+ },
methods: {
getSaleDeliveryVoucher(val, val2) {
val2.voucherId = val2.id
@@ -1218,6 +1220,17 @@ export default {
})
this.dataForm.deliveryProductRelationList = val2.businessOrderProductRelationalList
},
+ initPurchaseData() {
+ const data = this.setting.selectData
+ if (data.flag == '发货凭证生成发货单') {
+ data.forEach(item => {
+ item.voucherId = item.id
+ this.dataForm.deliveryProductRelationList = []
+ this.dataForm.deliveryVoucherRelationList.push(item)
+ this.dataForm.deliveryProductRelationList = item.voucherProductList
+ });
+ }
+ },
changeData(model, index) {
this.isEdit = false
this.childIndex = index
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
index 4c30676c..a39ce825 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
@@ -837,6 +837,7 @@ export default {
initPurchaseData() {
const data = this.setting.selectData
if (data.flag == '采购收货凭证生成销售发货凭证') {
+ //todo
// data.forEach(item => {
// debugger
// item.voucherId = item.id
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
index 3c711cc4..81819322 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
@@ -336,7 +336,20 @@ export default {
return
}
const selectData = this.multipleSelectionItem
+ let isSaleFlag = false
+ selectData.every(function (item) {
+ isSaleFlag = item.customerId == selectData[0].customerId
+ })
+ if (!isSaleFlag) {
+ this.$message({
+ type: 'error',
+ message: '收货单位不一致',
+ duration: 1500,
+ })
+ return
+ }
selectData.flag = '发货凭证生成销售订单'
+ selectData.deliveryType = '3'
if (!this.saleOrderFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.saleOrderFlowList.length === 1) {
@@ -355,6 +368,33 @@ export default {
return
}
const selectData = this.multipleSelectionItem
+ let isTransferFlag = false
+ let saleFlag = false
+ selectData.every(function (item) {
+ isTransferFlag = item.isTransfer == '1';
+ if (item.businessOrderId == undefined) {
+ saleFlag = true
+ } else {
+ saleFlag = item.businessOrderId = selectData[0].businessOrderId
+ }
+ });
+ if (!isTransferFlag) {
+ this.$message({
+ type: 'error',
+ message: '订单未生成销售单',
+ duration: 1500,
+ })
+ return
+ }
+ if (!saleFlag) {
+ this.$message({
+ type: 'error',
+ message: '生成销售单不一致',
+ duration: 1500,
+ })
+ return
+ }
+ selectData.flag = '发货凭证生成发货单'
if (!this.deliveryOrderFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.deliveryOrderFlowList.length === 1) {
@@ -373,6 +413,19 @@ export default {
return
}
const selectData = this.multipleSelectionItem
+ let isSaleFlag = false
+ selectData.every(function (item) {
+ isSaleFlag = item.isSaleDeliveryVoucher == '1'
+ })
+ if (!isSaleFlag) {
+ this.$message({
+ type: 'error',
+ message: '订单已生成采购收货凭证',
+ duration: 1500,
+ })
+ return
+ }
+ selectData.flag = '销售发货凭证生成采购收货凭证'
if (!this.purchaseReceiptVoucherFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.purchaseReceiptVoucherFlowList.length === 1) {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
index fe1e636f..3a93f2df 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
@@ -1553,6 +1553,13 @@ export default {
this.deliveryType = data[0].deliveryType
this.dataForm.businessOrderProductRelationalList = data[0].businessOrderProductRelationalList
}
+ if (data.flag == '发货凭证生成销售订单') {
+ this.dataForm.deliveryType = data.deliveryType
+ data.forEach(item => {
+ this.dataForm.businessOrderProductRelationalList = []
+ this.dataForm.businessOrderProductRelationalList = item.voucherProductList
+ });
+ }
},
selfInit() {
this.dataAll()