yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

按钮与列表修改

Browse Source
jg-waiwang-pro
vayne 8 months ago
parent 531ff969b9
commit a0a05e5363
19 changed files with 331 additions and 75 deletions
Show Stats Download Patch File Download Diff File

21
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DeliveryOrderMapper.xml
Unescape View File

@ -22,6 +22,11 @@
<result column="f_creator_user_id" property="creatorUserId"></result>
<result column="f_last_modify_time" property="lastModifyTime"></result>
<result column="f_last_modify_user_id" property="lastModifyUserId"></result>
<result column="deliveryStatus1" property="deliveryStatus1"></result>
<result column="deliveryType1" property="deliveryType1"></result>
<result column="supplyName" property="supplyName"></result>
<result column="relationOrder" property="relationOrder"></result>
<result column="warehouseName" property="warehouseName"></result>
</resultMap>
<resultMap id="deliveryOrderInfo" type="jnpf.model.deliveryorder.BusinessOrderInfoModel">
@ -38,6 +43,14 @@
<select id="queryDeliveryOrderList" resultMap="deliveryOrder">
select a.*,
case a.delivery_type
when '1' then '退供发货'
when '2' then '销售发货'
when '3' then '调拨发货'
when '4' then '领料入库'
when '5' then '盘亏入库'
when '6' then '其他入库'
end as deliveryType1,
case a.delivery_status
when '1' then '待校验'
when '2' then '待审核'
@ -47,8 +60,14 @@
when '6' then '已完成'
when '7' then '校验失败'
when '7' then '已取消'
end as deliveryStatus
end as deliveryStatus1,
b.name as supplyName,
c.return_cargo_code as relationOrder,
d.name as warehouseName
from jg_delivery_order a
left join jg_subject_basic b on a.subject_id = b.id and b.f_delete_mark is null
left join jg_return_cargo_order c on a.business_id = c.id and c.f_delete_mark is null
left join jg_business_line d on a.warehouse_id = d.id and d.f_delete_mark is null
${ew.customSqlSegment}
<if test="deliveryOrderPagination.sidx != null and deliveryOrderPagination.sidx != ''">
ORDER BY ${deliveryOrderPagination.sidx} ${deliveryOrderPagination.sort}

57
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReceiptOrderMapper.xml
Unescape View File

@ -27,12 +27,63 @@
<id column="f_last_modify_user_id" property="lastModifyUserId"/>
<id column="returnCargoOrder" property="returnCargoOrder"/>
<id column="receiptWarehouse" property="receiptWarehouse"/>
<id column="subjectName" property="subjectName"/>
<id column="receiptType1" property="receiptType1"/>
<id column="receiptStatus1" property="receiptStatus1"/>
<id column="purchaseOrder" property="purchaseOrder"/>
</resultMap>
<select id="queryReceiptOrderList" resultMap="receiptOrder">
select a.*, b.return_cargo_code as returnCargoOrder, c.code as receiptWarehouse from jg_receipt_order a
left join jg_return_cargo_order b on a.business_id = b.id and b.f_delete_mark is null
left join jg_business_line c on a.warehouse_id = c.id and c.f_delete_mark is null
SELECT
a.*,
CASE
a.receipt_type
WHEN '1' THEN
'采购收货'
WHEN '2' THEN
'退货收货'
WHEN '3' THEN
'调拨收货'
WHEN '4' THEN
'成品收货'
WHEN '5' THEN
'盘盈收货'
WHEN '6' THEN
'其他收货'
END AS receiptType1,
CASE
a.receipt_status
WHEN '1' THEN
'待校验'
WHEN '2' THEN
'待审核'
WHEN '3' THEN
'待处理'
WHEN '4' THEN
'待执行'
WHEN '5' THEN
'执行中'
WHEN '6' THEN
'已完成'
WHEN '7' THEN
'校验失败'
WHEN '7' THEN
'已取消'
END AS receiptStatus1,
b.return_cargo_code AS returnCargoOrder,
c.CODE AS receiptWarehouse,
d.NAME AS subjectName,
e.CODE AS purchaseOrder
FROM
jg_receipt_order a
LEFT JOIN jg_return_cargo_order b ON a.business_id = b.id
AND b.f_delete_mark is null
IS NULL LEFT JOIN jg_business_line c ON a.warehouse_id = c.id
AND c.f_delete_mark is null
IS NULL LEFT JOIN jg_subject_basic d ON a.subject_id = d.id
AND d.f_delete_mark is null
IS NULL LEFT JOIN jg_business_order e ON a.business_id = e.id
AND e.f_delete_mark IS NULL
${ew.customSqlSegment}
<if test="receiptOrderPagination.sidx != null and receiptOrderPagination.sidx != ''">
ORDER BY ${receiptOrderPagination.sidx} ${receiptOrderPagination.sort}

60
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml
Unescape View File

@ -26,21 +26,57 @@
<result column="f_creator_user_id" property="creatorUserId"/>
<result column="f_last_modify_time" property="lastModifyTime"/>
<result column="f_last_modify_user_id" property="lastModifyUserId"/>
<result column="documentStatus1" property="documentStatus1"/>
<result column="documentType1" property="documentType1"/>
<result column="supplyName" property="supplyName"/>
<result column="purchaseOrder" property="purchaseOrder"/>
<result column="warehouseName" property="warehouseName"/>
<result column="returnCargoWay1" property="returnCargoWay1"/>
</resultMap>
<select id="queryReturnCargoOrderList" resultMap="returnCargoOrder">
select a.*,
case a.document_status
when '1' then '待校验'
when '2' then '待审核'
when '3' then '待处理'
when '4' then '待执行'
when '5' then '执行中'
when '6' then '已完成'
when '7' then '校验失败'
when '7' then '已取消'
end as documentStatus
from jg_return_cargo_order a
SELECT
a.*,
CASE
a.document_status
WHEN '1' THEN
'待校验'
WHEN '2' THEN
'待审核'
WHEN '3' THEN
'待处理'
WHEN '4' THEN
'待执行'
WHEN '5' THEN
'执行中'
WHEN '6' THEN
'已完成'
WHEN '7' THEN
'校验失败'
WHEN '7' THEN
'已取消'
END AS documentStatus1,
CASE
a.document_type
WHEN '1' THEN
'采购退货'
WHEN '2' THEN
'销售退货'
WHEN '3' THEN
'其他退货'
END AS documentType1,
case a.return_cargo_way
WHEN '1' THEN '仅退款'
WHEN '2' THEN '退货退款'
END AS returnCargoWay1,
b.NAME AS supplyName,
c.code AS purchaseOrder,
d.NAME AS warehouseName
FROM
jg_return_cargo_order a
LEFT JOIN jg_subject_basic b ON a.subject_id = a.id and b.f_delete_mark is null
LEFT JOIN jg_business_order c ON a.business_id = c.id and c.f_delete_mark is null
LEFT JOIN jg_business_line d ON a.warehouse_id = d.id and d.f_delete_mark is null
${ew.customSqlSegment}
<if test="returnCargoOrderPagination.sidx != null and returnCargoOrderPagination.sidx != ''">
ORDER BY ${returnCargoOrderPagination.sidx} ${returnCargoOrderPagination.sort}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReceiptOrderController.java
Unescape View File

@ -103,7 +103,7 @@ public class ReceiptOrderController {
realList.add(receiptOrderMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, ReceiptOrderConstant.getFormData(), ReceiptOrderConstant.getColumnData(), receiptOrderPagination.getModuleId(),false);
// realList = generaterSwapUtil.swapDataList(realList, ReceiptOrderConstant.getFormData(), ReceiptOrderConstant.getColumnData(), receiptOrderPagination.getModuleId(),false);
//流程状态添加
for(Map<String, Object> vo:realList){

11
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java
Unescape View File

@ -81,5 +81,16 @@ public class DeliveryOrderEntity {
@TableField("F_VERSION")
private Integer version;
@TableField(exist = false)
private String deliveryStatus1;
@TableField(exist = false)
private String deliveryType1;
@TableField(exist = false)
private String supplyName;
@TableField(exist = false)
private String relationOrder;
@TableField(exist = false)
private String warehouseName;
}

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReceiptOrderEntity.java
Unescape View File

@ -87,4 +87,12 @@ public class ReceiptOrderEntity {
private String returnCargoOrder;
@TableField(exist = false)
private String receiptWarehouse;
@TableField(exist = false)
private String subjectName;
@TableField(exist = false)
private String receiptType1;
@TableField(exist = false)
private String receiptStatus1;
@TableField(exist = false)
private String purchaseOrder;
}

12
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java
Unescape View File

@ -119,4 +119,16 @@ public class ReturnCargoOrderEntity {
private String carriageMode;
@TableField(exist = false)
private String carrier;
@TableField(exist = false)
private String documentStatus1;
@TableField(exist = false)
private String documentType1;
@TableField(exist = false)
private String supplyName;
@TableField(exist = false)
private String purchaseOrder;
@TableField(exist = false)
private String warehouseName;
@TableField(exist = false)
private String returnCargoWay1;
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java
Unescape View File

@ -127,8 +127,8 @@ public class VoucherEntity {
private Integer version;
@TableField("IS_TRANSFER")
private String isTransfer;
@TableField("PURCHASE_ID")
private String purchaseId;
@TableField("BUSINESS_ORDER_ID")
private String businessOrderId;
@TableField("IS_SALE_DELIVERY_VOUCHER")
private String isSaleDeliveryVoucher;

11
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue
Unescape View File

@ -64,15 +64,16 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="deliveryCode" label="订单编号" align="left">
</el-table-column>
<el-table-column label="业务类型" prop="deliveryType" algin="left">
<el-table-column prop="supplyName" label="供应商名称" align="left">
</el-table-column>
<el-table-column label="业务类型" prop="deliveryType1" algin="left">
<template slot-scope="scope">
{{ scope.row.deliveryType}}
{{ scope.row.deliveryType1}}
</template>
</el-table-column>
<el-table-column prop="businessId" label="关联销售" align="left">
</el-table-column>
<el-table-column prop="reservedFields1" label="业务线" align="left">
<el-table-column prop="relationOrder" label="关联销售" align="left">
</el-table-column>
<el-table-column prop="subjectId" label="客户名称" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">

22
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
Unescape View File

@ -75,19 +75,19 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="voucherCode" label="凭证编号" align="left">
</el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left">
<el-table-column label="单据类型" prop="documentType1" algin="left">
<template slot-scope="scope">
{{ scope.row.documentType}}
{{ scope.row.documentType1}}
</template>
</el-table-column>
<el-table-column label="凭证类型" prop="voucherType" algin="left">
<el-table-column label="凭证类型" prop="voucherType1" algin="left">
<template slot-scope="scope">
{{ scope.row.voucherType}}
{{ scope.row.voucherType1}}
</template>
</el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus" algin="left">
<el-table-column label="凭证状态" prop="voucherStatus1" algin="left">
<template slot-scope="scope">
{{ scope.row.voucherStatus}}
{{ scope.row.voucherStatus1}}
</template>
</el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left">
@ -96,14 +96,14 @@
</el-table-column>
<el-table-column prop="vehicleName" label="车牌号" align="left">
</el-table-column>
<el-table-column label="运输方式" prop="modeTransport" algin="left">
<el-table-column label="运输方式" prop="modeTransport1" algin="left">
<template slot-scope="scope">
{{ scope.row.modeTransport}}
{{ scope.row.modeTransport1}}
</template>
</el-table-column>
<el-table-column label="承运方式" prop="transportationMethod" algin="left">
<el-table-column label="承运方式" prop="transportationMethod1" algin="left">
<template slot-scope="scope">
{{ scope.row.transportationMethod}}
{{ scope.row.transportationMethod1}}
</template>
</el-table-column>
<el-table-column prop="carrier" label="承运商" align="left">
@ -114,7 +114,7 @@
</el-table-column>
<el-table-column prop="destination" label="到达地" align="left">
</el-table-column>
<el-table-column prop="associateThirdSuppliers" label="三级供应商" align="left">
<el-table-column prop="thirdSupplyName" label="三级供应商" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column>

1
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
Unescape View File

@ -1233,7 +1233,6 @@ export default {
const data = this.setting.selectData
if (data.flag == '采购收货凭证生成收货单') {
data.forEach(item => {
debugger
item.voucherId = item.id
this.dataForm.deliveryProductRelationList = []
this.dataForm.deliveryVoucherRelationList.push(item)

52
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -67,26 +60,51 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="receiptCode" label="订单编号" align="left">
</el-table-column>
<el-table-column label="业务类型" prop="receiptType" algin="left">
<el-table-column prop="subjectName" label="供应商名称" align="left">
<template slot-scope="scope">
{{ scope.row.subjectName}}
</template>
</el-table-column>
<el-table-column label="单据类型" prop="receiptType" algin="left">
<template slot-scope="scope">
{{ scope.row.receiptType1}}
</template>
</el-table-column>
<el-table-column label="单据状态" prop="receiptStatus1" algin="left">
<template slot-scope="scope">
{{ scope.row.receiptStatus1}}
</template>
</el-table-column>
<el-table-column prop="purchaseOrder" label="关联单据号" align="left">
<template slot-scope="scope">
{{ scope.row.purchaseOrder}}
</template>
</el-table-column>
<el-table-column prop="purchaseOrder" label="执行单据号" align="left">
<template slot-scope="scope">
{{ scope.row.purchaseOrder}}
</template>
</el-table-column>
<el-table-column prop="receiptWarehouse" label="收货仓库" align="left">
<template slot-scope="scope">
{{ scope.row.receiptType}}
{{ scope.row.receiptWarehouse}}
</template>
</el-table-column>
<el-table-column prop="businessId" label="采购订单" align="left">
<el-table-column prop="deliveryAddress" label="收货数量" align="left">
</el-table-column>
<el-table-column prop="reservedFields1" label="业务线" align="left">
<el-table-column prop="enterpriseId" label="已收货数量" align="left">
</el-table-column>
<el-table-column prop="subjectId" label="供应商名称" align="left">
<el-table-column prop="receiptTime" label="收货时间" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">
<el-table-column prop="createOrderDate" label="制单时间" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
<el-table-column prop="creatorUserId" label="提交人" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="收货仓库" align="left">
<el-table-column prop="creatorTime" label="提交时间" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
<el-table-column prop="lastModifyUserId" label="修改人" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left">
<el-table-column prop="lastModifyTime" label="修改时间" align="left">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top">

10
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
Unescape View File

@ -830,8 +830,16 @@ export default {
}
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
mounted() {
this.initPurchaseData();
},
methods: {
initPurchaseData() {
const data = this.setting.selectData
if (data.flag == '销售发货凭证生成采购收货凭证') {
//todo
}
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index

4
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
Unescape View File

@ -366,10 +366,10 @@ export default {
let purchaseFlag = false
selectData.every(function (item) {
isTransferFlag = item.isTransfer == '1';
if (item.purchaseId == undefined) {
if (item.businessOrderId == undefined) {
purchaseFlag = true
} else {
purchaseFlag = item.purchaseId = selectData[0].purchaseId
purchaseFlag = item.businessOrderId = selectData[0].businessOrderId
}
});
if (!isTransferFlag) {

55
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -15,13 +8,13 @@
<el-input v-model="query.returnCargoCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.documentType" placeholder="请选择" clearable
:options="documentTypeOptions" :props="documentTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
@ -64,27 +57,53 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="returnCargoCode" label="订单编号" align="left">
</el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left">
<el-table-column prop="subjectId" label="供应商名称" align="left">
</el-table-column>
<el-table-column label="单据类型" prop="documentType1" algin="left">
<template slot-scope="scope">
{{ scope.row.documentType}}
{{ scope.row.documentType1}}
</template>
</el-table-column>
<el-table-column prop="businessId" label="采购订单" align="left">
<el-table-column label="单据状态" prop="documentStatus" algin="left">
<template slot-scope="scope">
{{ scope.row.documentStatus1}}
</template>
</el-table-column>
<el-table-column prop="reservedFields1" label="业务线" align="left">
<el-table-column prop="purchaseOrder" label="采购订单" align="left">
</el-table-column>
<el-table-column prop="subjectId" label="供应商名称" align="left">
<el-table-column prop="warehouseName" label="发货仓库" align="left">
</el-table-column>
<el-table-column prop="returnCargoWay1" label="退货方式" align="left">
<template slot-scope="scope">
{{ scope.row.returnCargoWay1}}
</template>
</el-table-column>
<el-table-column prop="warehouseName" label="计划退货数量" align="left">
</el-table-column>
<el-table-column prop="warehouseName" label="已发货数量" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">
<el-table-column prop="warehouseName" label="发货次数" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
<el-table-column prop="warehouseName" label="结算方式" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="收货仓库" align="left">
<el-table-column prop="warehouseName" label="配送方式" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
<el-table-column prop="warehouseName" label="运输方式" align="left">
</el-table-column>
<el-table-column prop="warehouseName" label="承运类型" align="left">
</el-table-column>
<el-table-column prop="warehouseName" label="承运商" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column>
<el-table-column prop="creatorUserId" label="提交人" align="left">
</el-table-column>
<el-table-column prop="creatorTime" label="提交时间" align="left">
</el-table-column>
<el-table-column prop="lastModifyUserId" label="修改人" align="left">
</el-table-column>
<el-table-column prop="lastModifyTime" label="修改时间" align="left">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1">等待审核</el-tag>

15
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
Unescape View File

@ -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

1
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
Unescape View File

@ -837,6 +837,7 @@ export default {
initPurchaseData() {
const data = this.setting.selectData
if (data.flag == '采购收货凭证生成销售发货凭证') {
//todo
// data.forEach(item => {
// debugger
// item.voucherId = item.id

53
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
Unescape View File

@ -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) {

7
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
Unescape View File

@ -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()

Write Preview
Loading…
Cancel
Save