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

Merge remote-tracking branch 'origin/master'

Browse Source
jg-waiwang-pro
胡川虎 7 months ago
parent 52d4fee5f0 61979f2511
commit 81a1ed84f8
46 changed files with 3060 additions and 3284 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,6 +22,12 @@
<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>
<result column="saleOrder" property="saleOrder"></result>
</resultMap>
<resultMap id="deliveryOrderInfo" type="jnpf.model.deliveryorder.BusinessOrderInfoModel">
@ -38,6 +44,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 +61,16 @@
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,
e.code as saleOrder
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
left join jg_business_order e on a.business_id = e.id and e.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.name 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
LEFT JOIN jg_business_line c ON a.warehouse_id = c.id
AND c.f_delete_mark is null
LEFT JOIN jg_subject_basic d ON a.subject_id = d.id
AND d.f_delete_mark 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}

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

@ -26,21 +26,116 @@
<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"/>
<result column="fixPriceMode1" property="fixPriceMode1"/>
<result column="deliveryType1" property="deliveryType1"/>
<result column="transportMode1" property="transportMode1"/>
<result column="carriageMode1" property="carriageMode1"/>
<result column="carrier1" property="carrier1"/>
<result column="urgentOrder1" property="urgentOrder1"/>
<result column="saleMode1" property="saleMode1"/>
</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,
case c.urgent_order
when '1' then '否'
when '2' then '是'
end as urgentOrder1,
case c.sale_mode
when '1' then '以销定采'
when '2' then '以采定销'
end as saleMode1,
CASE
c.fix_price_mode
WHEN '1' THEN
'锁价模式'
WHEN '2' THEN
'后结算模式'
END AS fixPriceMode1,
CASE
c.delivery_type
WHEN '1' THEN
'无'
WHEN '2' THEN
'仓配'
WHEN '3' THEN
'直送'
END AS deliveryType1,
CASE
c.transport_mode
WHEN '1' THEN
'公路'
WHEN '2' THEN
'铁路'
WHEN '3' THEN
'轮船'
WHEN '4' THEN
'空运'
WHEN '5' THEN
'无'
END AS transportMode1,
CASE
c.carriage_mode
WHEN '1' THEN
'仓库承运(DC)'
WHEN '2' THEN
'承运商'
WHEN '3' THEN
'供应商'
WHEN '4' THEN
'自提'
END AS carriageMode1,
c.carrier as carrier1,
d.NAME AS warehouseName
FROM
jg_return_cargo_order a
LEFT JOIN jg_subject_basic b ON a.subject_id = b.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}

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

@ -57,6 +57,10 @@
<result column="modeTransport1" property="modeTransport1"/>
<result column="transportationMethod1" property="transportationMethod1"/>
<result column="thirdSupplyName" property="thirdSupplyName"/>
<result column="purchaseDeliveryOrder" property="purchaseDeliveryOrder"/>
<result column="is_transfer" property="isTransfer"/>
<result column="business_order_id" property="businessOrderId"/>
<result column="is_sale_delivery_voucher" property="isSaleDeliveryVoucher"/>
</resultMap>
<select id="querySaleDeliveryVoucher" resultMap="voucherList">
SELECT
@ -182,9 +186,11 @@
when '3' then '供应商'
when '4' then '自提'
end as transportationMethod1,
b.name as thirdSupplyName
b.name as thirdSupplyName,
c.delivery_code as purchaseDeliveryOrder
from jg_voucher a
left join jg_subject_basic b on a.associate_third_suppliers = b.id and b.f_delete_mark is null
left join jg_delivery_order c on a.associated_document_no = c.id and c.f_delete_mark is null
${ew.customSqlSegment}
<if test="voucherPagination.sidx != null and voucherPagination.sidx != ''">
ORDER BY ${voucherPagination.sidx} ${voucherPagination.sort}

17
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
Unescape View File

@ -2,6 +2,7 @@ package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.BusinessOrderMapper;
import jnpf.mapper.VoucherMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.businessorder.*;
@ -56,6 +57,9 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
@Resource
private BusinessOrderMapper businessOrderMapper;
@Resource
private VoucherMapper voucherMapper;
@Override
public List<BusinessOrderEntity> getList(BusinessOrderPagination businessOrderPagination){
return getTypeList(businessOrderPagination,businessOrderPagination.getDataType());
@ -966,8 +970,21 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
}else{
}
businessOrderProductRelationalService.saveOrUpdate(entitys);
//更新凭证单的转换状态
if (StringUtil.isNotEmpty(entitys.getVoucherId())){
VoucherEntity voucherEntity = voucherMapper.selectById(entitys.getVoucherId());
voucherEntity.setIsTransfer("2");
voucherEntity.setBusinessOrderId(entity.getId());
voucherMapper.updateById(voucherEntity);
}
}
}
//更新采购订单/销售订单的转换状态
if (StringUtil.isNotEmpty(entity.getIsTransferSource())){
BusinessOrderEntity businessOrderEntity = businessOrderMapper.selectById(entity.getIsTransferSource());
businessOrderEntity.setIsTransfer("2");
businessOrderMapper.updateById(businessOrderEntity);
}
}
@Override

7
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReturnCargoOrderServiceImpl.java
Unescape View File

@ -2,6 +2,7 @@ package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.ReturnCargoOrderMapper;
import jnpf.mapper.VoucherMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.returncargoorder.*;
@ -55,6 +56,8 @@ public class ReturnCargoOrderServiceImpl extends ServiceImpl<ReturnCargoOrderMap
private DeliveryProductRelationService deliveryProductRelationService;
@Resource
private ReturnCargoOrderMapper returnCargoOrderMapper;
@Resource
private VoucherMapper voucherMapper;
@Override
public List<ReturnCargoOrderEntity> getList(ReturnCargoOrderPagination returnCargoOrderPagination){
return getTypeList(returnCargoOrderPagination,returnCargoOrderPagination.getDataType());
@ -478,6 +481,10 @@ public class ReturnCargoOrderServiceImpl extends ServiceImpl<ReturnCargoOrderMap
}else{
}
deliveryVoucherRelationService.saveOrUpdate(entitys);
VoucherEntity voucherEntity = voucherMapper.selectById(entitys.getVoucherId());
voucherEntity.setIsReturnCargoOrder("2");
voucherEntity.setBusinessOrderId(entity.getId());
voucherMapper.updateById(voucherEntity);
}
}
//DeliveryProductRelation子表数据新增修改

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
Unescape View File

@ -548,6 +548,11 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
voucherVehicleService.saveOrUpdate(entitys);
}
}
if (StringUtil.isNotEmpty(entity.getIsSaleDeliveryVoucherSource())){
VoucherEntity voucherEntity = voucherMapper.selectById(entity.getIsSaleDeliveryVoucherSource());
voucherEntity.setIsSaleDeliveryVoucher("2");
voucherMapper.updateById(voucherEntity);
}
}
@Override

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

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

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

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

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

25
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
Unescape View File

@ -482,4 +482,29 @@ public class WorkOrderController {
return ActionResult.success(workOrderMap);
}
/**
* 更新状态
* @param id
* @param
* @return
*/
@PostMapping("/closestatus/{id}/{status}")
@Operation(summary = "更新状态")
public ActionResult updateStatus(@PathVariable("id") String id,@PathVariable("status") String status){
WorkOrderEntity entity= workOrderService.getInfo(id);
if(entity!=null){
try{
entity.setStatus(status);
workOrderService.update(id, entity);
}catch(Exception e){
return ActionResult.fail("修改数据状态失败");
}
return ActionResult.success("状态更新成功");
}else{
return ActionResult.fail("更新状态失败，数据不存在");
}
}
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java
Unescape View File

@ -177,4 +177,6 @@ public class BusinessOrderEntity {
private String carriageMode1;
@TableField(exist = false)
private String wareHouseName;
@TableField(exist = false)
private String isTransferSource;
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java
Unescape View File

@ -66,4 +66,7 @@ public class BusinessOrderProductRelationalEntity {
private String notTaxCount;
@TableField(value = "LAST_SALE_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private String lastSalePrice;
@TableField(exist = false)
private String voucherId;
}

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

@ -81,5 +81,18 @@ 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;
@TableField(exist = false)
private String saleOrder;
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryVoucherRelationEntity.java
Unescape View File

@ -70,4 +70,7 @@ public class DeliveryVoucherRelationEntity {
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField(exist = false)
private String isTransfer;
}

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;
}

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

@ -119,4 +119,30 @@ 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;
@TableField(exist = false)
private String fixPriceMode1;
@TableField(exist = false)
private String deliveryType1;
@TableField(exist = false)
private String transportMode1;
@TableField(exist = false)
private String carriageMode1;
@TableField(exist = false)
private String carrier1;
@TableField(exist = false)
private String urgentOrder1;
@TableField(exist = false)
private String saleMode1;
}

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

@ -127,10 +127,12 @@ 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;
@TableField("IS_RETURN_CARGO_ORDER")
private String isReturnCargoOrder;
@TableField(exist = false)
@ -165,4 +167,8 @@ public class VoucherEntity {
private String transportationMethod1;
@TableField(exist = false)
private String thirdSupplyName;
@TableField(exist = false)
private String purchaseDeliveryOrder;
@TableField(exist = false)
private String isSaleDeliveryVoucherSource;
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java
Unescape View File

@ -101,4 +101,7 @@ public class BusinessOrderForm {
/** 区分采购与销售 */
@JsonProperty("businessType")
private Object businessType;
/** 是否转换采购/销售 */
@JsonProperty("isTransferSource")
private Object isTransferSource;
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderProductRelationalModel.java
Unescape View File

@ -61,4 +61,7 @@ public class BusinessOrderProductRelationalModel {
/** 上一次销售单价 **/
@JSONField(name = "lastSalePrice")
private String lastSalePrice;
@JSONField(name = "voucherId")
private String voucherId;
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryVoucherRelationModel.java
Unescape View File

@ -67,4 +67,7 @@ public class DeliveryVoucherRelationModel {
/** 业务类型 **/
@JSONField(name = "businessType")
private String businessType;
@JSONField(name = "isTransfer")
private String isTransfer;
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java
Unescape View File

@ -117,4 +117,7 @@ public class VoucherForm {
/** 业务类型 **/
@JsonProperty("businessType")
private Object businessType;
/** 发货凭证 **/
@JsonProperty("isSaleDeliveryVoucherSource")
private Object isSaleDeliveryVoucherSource;
}

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

@ -17,15 +17,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="业务类型">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
:options="deliveryTypeOptions" :props="deliveryTypeProps">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
:props="deliveryTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -39,11 +39,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -51,12 +49,10 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -64,75 +60,81 @@
@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.deliveryType1 }}
</template>
</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 prop="relationOrder" label="关联单据号" align="left">
</el-table-column>
<el-table-column prop="reservedFields1" label="业务线" align="left">
<el-table-column prop="warehouseName" label="发货仓库" align="left">
</el-table-column>
<el-table-column prop="subjectId" label="客户名称" align="left">
<el-table-column prop="warehouseOrder" label="发货数量" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">
<el-table-column prop="warehouseOrder" label="已发货数量" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
<el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="发货仓库" align="left">
<el-table-column prop="preparationTime" label="发货时间" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
<el-table-column prop="creatorUserId" label="提交人" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left">
<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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

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

@ -2,11 +2,11 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -17,43 +17,37 @@
</el-col>
<el-col :span="8" v-if="judgeShow('voucherCode')">
<jnpf-form-tip-item label="凭证编号" v-if="judgeShow('voucherCode')" prop="voucherCode">
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('voucherCode')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('voucherCode')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherType')">
<jnpf-form-tip-item label="凭证类型" v-if="judgeShow('voucherType')" prop="voucherType">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType',-1)"
placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
:style='{"width":"100%"}' :options="voucherTypeOptions" :props="voucherTypeProps">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType', -1)" placeholder="请选择"
:disabled="judgeWrite('voucherType')" clearable :style='{ "width": "100%" }' :options="voucherTypeOptions"
:props="voucherTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('preparationTime')">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')"
prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime"
@change="changeData('preparationTime',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')" prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime" @change="changeData('preparationTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('associateThirdSuppliers')">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')"
prop="associateThirdSuppliers">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')" prop="associateThirdSuppliers">
<JnpfPopupSelect v-model="dataForm.associateThirdSuppliers"
@change="changeData('associateThirdSuppliers',-1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.associateThirdSuppliers"
placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='associateThirdSuppliers' interfaceId="523899951990705477" :pageSize="20"
:columnOptions="associateThirdSupplierscolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('associateThirdSuppliers', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.associateThirdSuppliers" placeholder="请选择"
:disabled="judgeWrite('associateThirdSuppliers')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='associateThirdSuppliers' interfaceId="530001884988047877"
:pageSize="20" :columnOptions="associateThirdSupplierscolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
@ -64,43 +58,38 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures"
@change="changeData('voucherPictures',-1)" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')" prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures" @change="changeData('voucherPictures', -1)"
:disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
<jnpf-form-tip-item label="磅单编号" v-if="judgeShow('poundCode')" prop="poundCode">
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode',-1)"
placeholder="请输入" :disabled="judgeWrite('poundCode')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode', -1)" placeholder="请输入"
:disabled="judgeWrite('poundCode')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehicleName')">
<jnpf-form-tip-item label="车牌号" v-if="judgeShow('vehicleName')" prop="vehicleName">
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName',-1)"
placeholder="请输入" :disabled="judgeWrite('vehicleName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName', -1)" placeholder="请输入"
:disabled="judgeWrite('vehicleName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('supplierName')">
<jnpf-form-tip-item label="发货单位" v-if="judgeShow('supplierName')" prop="supplierName">
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName',-1)"
placeholder="请输入" :disabled="judgeWrite('supplierName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName', -1)" placeholder="请输入"
:disabled="judgeWrite('supplierName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('customerName')">
<jnpf-form-tip-item label="收货单位" v-if="judgeShow('customerName')" prop="customerName">
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName',-1)"
placeholder="请输入" :disabled="judgeWrite('customerName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName', -1)" placeholder="请输入"
:disabled="judgeWrite('customerName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -111,139 +100,116 @@
</div>
<el-table :data="dataForm.voucherProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')"
prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
<span class="required-sign" v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId"
@change="changeData('voucherproduct-productId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId'+scope.$index"
interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('voucherproduct-productId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('voucherproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('voucherproductList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('voucherproduct-spec',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-spec')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.spec" @change="changeData('voucherproduct-spec', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-spec')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" v-if="judgeShow('voucherproduct-unit')" prop="unit">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-unit')">*</span>单位
<span class="required-sign" v-if="judgeRequired('voucherproductList-unit')">*</span>单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit"
@change="changeData('voucherproduct-unit',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-unit')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.unit" @change="changeData('voucherproduct-unit', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-unit')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')"
prop="grossWeight">
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')" prop="grossWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
<span class="required-sign" v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.grossWeight"
@change="changeData('voucherproduct-grossWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-grossWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-grossWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-grossWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')"
prop="tareWeight">
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')" prop="tareWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
<span class="required-sign" v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.tareWeight"
@change="changeData('voucherproduct-tareWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-tareWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-tareWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-tareWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')"
prop="buckleWeight">
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')" prop="buckleWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
<span class="required-sign" v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.buckleWeight"
@change="changeData('voucherproduct-buckleWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-buckleWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')"
prop="netWeight">
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')" prop="netWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
<span class="required-sign" v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.netWeight"
@change="changeData('voucherproduct-netWeight',scope.$index)"
<JnpfInput v-model="scope.row.netWeight" @change="changeData('voucherproduct-netWeight', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-netWeight')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-netWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('voucherproduct-remark')" prop="remark">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-remark')">*</span>备注
<span class="required-sign" v-if="judgeRequired('voucherproductList-remark')">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('voucherproduct-remark',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-remark')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.remark" @change="changeData('voucherproduct-remark', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-remark')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')"
prop="printTime">
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')" prop="printTime">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
<span class="required-sign" v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.printTime"
@change="changeData('voucherproduct-printTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-printTime')"
clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
@change="changeData('voucherproduct-printTime', scope.$index)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-printTime')" clearable
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
@ -254,8 +220,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvoucherproductList()"
v-if="!judgeWrite('voucherproductList')">
<div class="table-actions" @click="addvoucherproductList()" v-if="!judgeWrite('voucherproductList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -268,145 +233,125 @@
</el-col>
<el-col :span="8" v-if="judgeShow('modeTransport')">
<jnpf-form-tip-item label="运输方式" v-if="judgeShow('modeTransport')" prop="modeTransport">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport',-1)"
placeholder="请选择" :disabled="judgeWrite('modeTransport')" clearable
:style='{"width":"100%"}' :options="modeTransportOptions"
:props="modeTransportProps">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport', -1)" placeholder="请选择"
:disabled="judgeWrite('modeTransport')" clearable :style='{ "width": "100%" }'
:options="modeTransportOptions" :props="modeTransportProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('transportationMethod')">
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')"
prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod"
@change="changeData('transportationMethod',-1)" placeholder="请选择"
:disabled="judgeWrite('transportationMethod')" clearable :style='{"width":"100%"}'
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')" prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod" @change="changeData('transportationMethod', -1)"
placeholder="请选择" :disabled="judgeWrite('transportationMethod')" clearable :style='{ "width": "100%" }'
:options="transportationMethodOptions" :props="transportationMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('carrier')">
<jnpf-form-tip-item label="承运商" v-if="judgeShow('carrier')" prop="carrier">
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier',-1)"
placeholder="请输入" :disabled="judgeWrite('carrier')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier', -1)" placeholder="请输入"
:disabled="judgeWrite('carrier')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('placeDispatch')">
<jnpf-form-tip-item label="起运地" v-if="judgeShow('placeDispatch')" prop="placeDispatch">
<JnpfAreaSelect v-model="dataForm.placeDispatch"
@change="changeData('placeDispatch',-1)" placeholder="请选择" selectType="all"
:disabled="judgeWrite('placeDispatch')" clearable :style='{"width":"100%"}'
:level="2">
<JnpfAreaSelect v-model="dataForm.placeDispatch" @change="changeData('placeDispatch', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('placeDispatch')" clearable :style='{ "width": "100%" }' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('destination')">
<jnpf-form-tip-item label="到达地" v-if="judgeShow('destination')" prop="destination">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination',-1)"
placeholder="请选择" selectType="all" :disabled="judgeWrite('destination')" clearable
:style='{"width":"100%"}' :level="2">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('destination')" clearable :style='{ "width": "100%" }' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="运费" v-if="judgeShow('freight')" prop="freight">
<JnpfInput v-model="dataForm.freight" @change="changeData('freight',-1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.freight" @change="changeData('freight', -1)" placeholder="请输入"
:disabled="judgeWrite('freight')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures')">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')"
prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures',-1)" :disabled="judgeWrite('vehiclePictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')" prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures" @change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures1')">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')"
prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1"
@change="changeData('vehiclePictures1',-1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')" prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1" @change="changeData('vehiclePictures1', -1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures2')">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')"
prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2"
@change="changeData('vehiclePictures2',-1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')" prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2" @change="changeData('vehiclePictures2', -1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures')">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')"
prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures"
@change="changeData('driverPictures',-1)" :disabled="judgeWrite('driverPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')" prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures" @change="changeData('driverPictures', -1)"
:disabled="judgeWrite('driverPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures1')">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')"
prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1"
@change="changeData('driverPictures1',-1)" :disabled="judgeWrite('driverPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')" prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1" @change="changeData('driverPictures1', -1)"
:disabled="judgeWrite('driverPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures2')">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')"
prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2"
@change="changeData('driverPictures2',-1)" :disabled="judgeWrite('driverPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')" prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2" @change="changeData('driverPictures2', -1)"
:disabled="judgeWrite('driverPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures')">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')"
prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures"
@change="changeData('weighPictures',-1)" :disabled="judgeWrite('weighPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')" prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures" @change="changeData('weighPictures', -1)"
:disabled="judgeWrite('weighPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures1')">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')"
prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1"
@change="changeData('weighPictures1',-1)" :disabled="judgeWrite('weighPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')" prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1" @change="changeData('weighPictures1', -1)"
:disabled="judgeWrite('weighPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures2')">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')"
prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2"
@change="changeData('weighPictures2',-1)" :disabled="judgeWrite('weighPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')" prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2" @change="changeData('weighPictures2', -1)"
:disabled="judgeWrite('weighPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures3')">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')"
prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3"
@change="changeData('weighPictures3',-1)" :disabled="judgeWrite('weighPictures3')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')" prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3" @change="changeData('weighPictures3', -1)"
:disabled="judgeWrite('weighPictures3')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
@ -417,67 +362,55 @@
</div>
<el-table :data="dataForm.voucherVehicleList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')"
prop="vehicleId">
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')" prop="vehicleId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.vehicleId"
@change="changeData('vouchervehicle-vehicleId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-vehicleId')"
@change="changeData('vouchervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-vehicleId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='vehicle_number' :field="'vehicleId'+scope.$index"
interfaceId="529920852288864453" :pageSize="20"
:columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{"width":"100%"}'>
relationField='vehicle_number' :field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
:pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')"
prop="driverName">
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')" prop="driverName">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.driverName"
@change="changeData('vouchervehicle-driverName',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-driverName')"
clearable :style='{"width":"100%"}'>
@change="changeData('vouchervehicle-driverName', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-driverName')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')"
prop="telephone">
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')" prop="telephone">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.telephone"
@change="changeData('vouchervehicle-telephone',scope.$index)"
<JnpfInput v-model="scope.row.telephone" @change="changeData('vouchervehicle-telephone', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-telephone')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-telephone')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')"
prop="carrier">
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')" prop="carrier">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.carrier"
@change="changeData('vouchervehicle-carrier',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-carrier')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.carrier" @change="changeData('vouchervehicle-carrier', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-carrier')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -488,8 +421,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvouchervehicleList()"
v-if="!judgeWrite('vouchervehicleList')">
<div class="table-actions" @click="addvouchervehicleList()" v-if="!judgeWrite('vouchervehicleList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -522,8 +454,8 @@
</el-col> -->
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />

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

@ -10,15 +10,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="凭证类型">
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
:options="voucherTypeOptions" :props="voucherTypeProps" multiple>
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
:props="voucherTypeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
@ -33,11 +33,10 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -47,11 +46,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -59,15 +56,16 @@
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createReturnCargoOrder()">生成退货订单
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createDeliveryOrder()">生成发货单
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -75,35 +73,35 @@
@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">
</el-table-column>
<el-table-column prop="associatedDocumentNo" label="关联单据号" align="left">
<el-table-column prop="purchaseDeliveryOrder" label="关联单据号" align="left">
</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,58 +112,53 @@
</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>
<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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>
@ -242,6 +235,7 @@ export default {
flowListVisible: false,
flowList: [],
returnCargoFlowList: [],
deliveryFlowList: [],
exportBoxVisible: false,
voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
voucherTypeProps: { "label": "fullName", "value": "id" },
@ -290,6 +284,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: {
createReturnCargoOrder() {
@ -302,6 +305,28 @@ export default {
return
}
const selectData = this.multipleSelectionItem
let supplyFlag = false
let customFlag = false
selectData.every(function (item) {
supplyFlag = item.supplierId == selectData[0].supplierId;
customFlag = item.customerId == selectData[0].customerId;
});
if (!supplyFlag) {
this.$message({
type: 'error',
message: '供货单位不一致',
duration: 1500,
})
return
}
if (!customFlag) {
this.$message({
type: 'error',
message: '收货单位不一致',
duration: 1500,
})
return
}
selectData.flag = '发货凭证生成退货订单'
if (!this.returnCargoFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
@ -311,6 +336,16 @@ export default {
this.flowListVisible = true
}
},
createDeliveryOrder() {
if (!this.multipleSelectionItem.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
})
return
}
},
selectFlow1(item, selectData) {
let data = {
id: '',

772
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -5,8 +5,8 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
:options="orderTypeOptions" :props="orderTypeProps">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable :options="orderTypeOptions"
:props="orderTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -17,29 +17,29 @@
</el-col>
<el-col :span="6">
<el-form-item label="是否紧急">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable
:options="urgentOrderOptions" :props="urgentOrderProps">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable :options="urgentOrderOptions"
:props="urgentOrderProps">
</JnpfSelect>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送方式">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
:options="deliveryTypeOptions" :props="deliveryTypeProps" multiple>
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
:props="deliveryTypeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据状态">
<JnpfSelect v-model="query.status" placeholder="请选择" clearable
:options="statusOptions" :props="statusProps" multiple>
<JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
:props="statusProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
@ -48,11 +48,10 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -62,27 +61,22 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addSaleHandle()">生成销售订单
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addSaleHandle()">生成销售订单
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -90,38 +84,35 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="code" label="单据编号" align="left">
</el-table-column>
<el-table-column prop="subjectName" label="一级供应商" align="left">
<el-table-column prop="subjectName" label="供应商名称" align="left">
</el-table-column>
<el-table-column label="单据类型" prop="orderType" algin="left">
<el-table-column label="单据类型" prop="orderType1" algin="left">
<template slot-scope="scope">
{{ scope.row.orderType1}}
{{ scope.row.orderType1 }}
</template>
</el-table-column>
<el-table-column label="单据状态" prop="status" algin="left">
<el-table-column label="单据状态" prop="purchaseStatus" algin="left">
<template slot-scope="scope">
{{ scope.row.purchaseStatus}}
{{ scope.row.purchaseStatus }}
</template>
</el-table-column>
<el-table-column prop="saleCode" label="关联销售" align="left">
</el-table-column>
<el-table-column prop="saleStatus" label="关联单据状态" align="left">
<template slot-scope="scope">
{{ scope.row.saleStatus}}
{{ scope.row.saleStatus }}
</template>
</el-table-column>
<el-table-column prop="contractName" label="关联合同号" align="left">
</el-table-column>
<el-table-column label="是否紧急" prop="urgentOrder" algin="left">
<el-table-column label="是否紧急" prop="urgentOrder1" algin="left">
<template slot-scope="scope">
{{ scope.row.urgentOrder1}}
{{ scope.row.urgentOrder1 }}
</template>
</el-table-column>
<el-table-column prop="wareHouseName" label="收货仓库" align="left">
</el-table-column>
<el-table-column prop="expectArriveDateStart" label="期望送达" align="left">
</el-table-column>
<el-table-column prop="businessNum" label="计划采购数量" align="left">
</el-table-column>
<el-table-column prop="storageNumber" label="已收货数量" align="left">
@ -129,38 +120,38 @@
<el-table-column prop="storageNum" label="收货次数" align="left">
</el-table-column>
<el-table-column label="采购模式" prop="saleMode" algin="left">
<el-table-column label="采购模式" prop="saleMode1" algin="left">
<template slot-scope="scope">
{{ scope.row.saleMode1}}
{{ scope.row.saleMode1 }}
</template>
</el-table-column>
<el-table-column label="结算方式" prop="fixPriceMode" algin="left">
<el-table-column label="结算方式" prop="fixPriceMode1" algin="left">
<template slot-scope="scope">
{{ scope.row.fixPriceMode1}}
{{ scope.row.fixPriceMode1 }}
</template>
</el-table-column>
<el-table-column label="配送方式" prop="deliveryType" algin="left">
<el-table-column label="配送方式" prop="deliveryType1" algin="left">
<template slot-scope="scope">
{{ scope.row.deliveryType1}}
{{ scope.row.deliveryType1 }}
</template>
</el-table-column>
<el-table-column label="运输方式" prop="transportMode" algin="left">
<el-table-column label="运输方式" prop="transportMode1" algin="left">
<template slot-scope="scope">
{{ scope.row.transportMode1}}
{{ scope.row.transportMode1 }}
</template>
</el-table-column>
<el-table-column label="承运类型" prop="carriageMode" algin="left">
<el-table-column label="承运类型" prop="carriageMode1" algin="left">
<template slot-scope="scope">
{{ scope.row.carriageMode1}}
{{ scope.row.carriageMode1 }}
</template>
</el-table-column>
<el-table-column label="承运商" prop="carrier" algin="left">
<template slot-scope="scope">
{{ scope.row.carrier}}
{{ scope.row.carrier }}
</template>
</el-table-column>
@ -173,7 +164,6 @@
<el-table-column prop="creatorTime" label="创建时间" align="left">
</el-table-column>
<el-table-column prop="realName" label="创建人" align="left">
</el-table-column>
<el-table-column prop="lastModifyTime" label="更新时间" align="left">
@ -183,52 +173,47 @@
<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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<SaleFlowBox v-if="saleFlowVisible" ref="SaleFlowBox" @close="colseFlow" />
</div>
</template>
@ -402,7 +387,6 @@ export default {
return
}
const selectData = this.multipleSelectionItem
debugger
if (selectData.isTransfer == '2') {
this.$message({
type: 'error',
@ -615,7 +599,6 @@ export default {
method: 'post',
data: _query
}).then(res => {
debugger
var _list = res.data.list;
this.list = _list.map(o => ({
...o,

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)

115
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">
@ -17,15 +10,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="业务类型">
<JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable
:options="receiptTypeOptions" :props="receiptTypeProps">
<JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable :options="receiptTypeOptions"
:props="receiptTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -39,27 +32,23 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
<!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createDeliveryOrder()">生成发货单
</el-button>
</el-button> -->
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -67,75 +56,95 @@
@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">
<el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

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

@ -2,11 +2,11 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -17,43 +17,37 @@
</el-col>
<el-col :span="8" v-if="judgeShow('voucherCode')">
<jnpf-form-tip-item label="凭证编号" v-if="judgeShow('voucherCode')" prop="voucherCode">
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('voucherCode')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('voucherCode')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherType')">
<jnpf-form-tip-item label="凭证类型" v-if="judgeShow('voucherType')" prop="voucherType">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType',-1)"
placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
:style='{"width":"100%"}' :options="voucherTypeOptions" :props="voucherTypeProps">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType', -1)" placeholder="请选择"
:disabled="judgeWrite('voucherType')" clearable :style='{ "width": "100%" }' :options="voucherTypeOptions"
:props="voucherTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('preparationTime')">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')"
prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime"
@change="changeData('preparationTime',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')" prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime" @change="changeData('preparationTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('associateThirdSuppliers')">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')"
prop="associateThirdSuppliers">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')" prop="associateThirdSuppliers">
<JnpfPopupSelect v-model="dataForm.associateThirdSuppliers"
@change="changeData('associateThirdSuppliers',-1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.associateThirdSuppliers"
placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='associateThirdSuppliers' interfaceId="523899951990705477" :pageSize="20"
:columnOptions="associateThirdSupplierscolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('associateThirdSuppliers', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.associateThirdSuppliers" placeholder="请选择"
:disabled="judgeWrite('associateThirdSuppliers')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='associateThirdSuppliers' interfaceId="530001884988047877"
:pageSize="20" :columnOptions="associateThirdSupplierscolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
@ -64,43 +58,38 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures"
@change="changeData('voucherPictures',-1)" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')" prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures" @change="changeData('voucherPictures', -1)"
:disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
<jnpf-form-tip-item label="磅单编号" v-if="judgeShow('poundCode')" prop="poundCode">
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode',-1)"
placeholder="请输入" :disabled="judgeWrite('poundCode')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode', -1)" placeholder="请输入"
:disabled="judgeWrite('poundCode')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehicleName')">
<jnpf-form-tip-item label="车牌号" v-if="judgeShow('vehicleName')" prop="vehicleName">
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName',-1)"
placeholder="请输入" :disabled="judgeWrite('vehicleName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName', -1)" placeholder="请输入"
:disabled="judgeWrite('vehicleName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('supplierName')">
<jnpf-form-tip-item label="发货单位" v-if="judgeShow('supplierName')" prop="supplierName">
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName',-1)"
placeholder="请输入" :disabled="judgeWrite('supplierName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName', -1)" placeholder="请输入"
:disabled="judgeWrite('supplierName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('customerName')">
<jnpf-form-tip-item label="收货单位" v-if="judgeShow('customerName')" prop="customerName">
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName',-1)"
placeholder="请输入" :disabled="judgeWrite('customerName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName', -1)" placeholder="请输入"
:disabled="judgeWrite('customerName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -111,139 +100,116 @@
</div>
<el-table :data="dataForm.voucherProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')"
prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
<span class="required-sign" v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId"
@change="changeData('voucherproduct-productId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId'+scope.$index"
interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('voucherproduct-productId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('voucherproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('voucherproductList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('voucherproduct-spec',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-spec')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.spec" @change="changeData('voucherproduct-spec', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-spec')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" v-if="judgeShow('voucherproduct-unit')" prop="unit">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-unit')">*</span>单位
<span class="required-sign" v-if="judgeRequired('voucherproductList-unit')">*</span>单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit"
@change="changeData('voucherproduct-unit',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-unit')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.unit" @change="changeData('voucherproduct-unit', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-unit')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')"
prop="grossWeight">
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')" prop="grossWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
<span class="required-sign" v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.grossWeight"
@change="changeData('voucherproduct-grossWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-grossWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-grossWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-grossWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')"
prop="tareWeight">
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')" prop="tareWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
<span class="required-sign" v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.tareWeight"
@change="changeData('voucherproduct-tareWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-tareWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-tareWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-tareWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')"
prop="buckleWeight">
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')" prop="buckleWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
<span class="required-sign" v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.buckleWeight"
@change="changeData('voucherproduct-buckleWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-buckleWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')"
prop="netWeight">
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')" prop="netWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
<span class="required-sign" v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.netWeight"
@change="changeData('voucherproduct-netWeight',scope.$index)"
<JnpfInput v-model="scope.row.netWeight" @change="changeData('voucherproduct-netWeight', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-netWeight')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-netWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('voucherproduct-remark')" prop="remark">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-remark')">*</span>备注
<span class="required-sign" v-if="judgeRequired('voucherproductList-remark')">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('voucherproduct-remark',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-remark')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.remark" @change="changeData('voucherproduct-remark', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-remark')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')"
prop="printTime">
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')" prop="printTime">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
<span class="required-sign" v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.printTime"
@change="changeData('voucherproduct-printTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-printTime')"
clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
@change="changeData('voucherproduct-printTime', scope.$index)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-printTime')" clearable
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
@ -254,8 +220,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvoucherproductList()"
v-if="!judgeWrite('voucherproductList')">
<div class="table-actions" @click="addvoucherproductList()" v-if="!judgeWrite('voucherproductList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -268,145 +233,125 @@
</el-col>
<el-col :span="8" v-if="judgeShow('modeTransport')">
<jnpf-form-tip-item label="运输方式" v-if="judgeShow('modeTransport')" prop="modeTransport">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport',-1)"
placeholder="请选择" :disabled="judgeWrite('modeTransport')" clearable
:style='{"width":"100%"}' :options="modeTransportOptions"
:props="modeTransportProps">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport', -1)" placeholder="请选择"
:disabled="judgeWrite('modeTransport')" clearable :style='{ "width": "100%" }'
:options="modeTransportOptions" :props="modeTransportProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('transportationMethod')">
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')"
prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod"
@change="changeData('transportationMethod',-1)" placeholder="请选择"
:disabled="judgeWrite('transportationMethod')" clearable :style='{"width":"100%"}'
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')" prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod" @change="changeData('transportationMethod', -1)"
placeholder="请选择" :disabled="judgeWrite('transportationMethod')" clearable :style='{ "width": "100%" }'
:options="transportationMethodOptions" :props="transportationMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('carrier')">
<jnpf-form-tip-item label="承运商" v-if="judgeShow('carrier')" prop="carrier">
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier',-1)"
placeholder="请输入" :disabled="judgeWrite('carrier')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier', -1)" placeholder="请输入"
:disabled="judgeWrite('carrier')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('placeDispatch')">
<jnpf-form-tip-item label="起运地" v-if="judgeShow('placeDispatch')" prop="placeDispatch">
<JnpfAreaSelect v-model="dataForm.placeDispatch"
@change="changeData('placeDispatch',-1)" placeholder="请选择" selectType="all"
:disabled="judgeWrite('placeDispatch')" clearable :style='{"width":"100%"}'
:level="2">
<JnpfAreaSelect v-model="dataForm.placeDispatch" @change="changeData('placeDispatch', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('placeDispatch')" clearable :style='{ "width": "100%" }' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('destination')">
<jnpf-form-tip-item label="到达地" v-if="judgeShow('destination')" prop="destination">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination',-1)"
placeholder="请选择" selectType="all" :disabled="judgeWrite('destination')" clearable
:style='{"width":"100%"}' :level="2">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('destination')" clearable :style='{ "width": "100%" }' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="运费" v-if="judgeShow('freight')" prop="freight">
<JnpfInput v-model="dataForm.freight" @change="changeData('freight',-1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.freight" @change="changeData('freight', -1)" placeholder="请输入"
:disabled="judgeWrite('freight')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures')">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')"
prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures',-1)" :disabled="judgeWrite('vehiclePictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')" prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures" @change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures1')">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')"
prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1"
@change="changeData('vehiclePictures1',-1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')" prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1" @change="changeData('vehiclePictures1', -1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures2')">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')"
prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2"
@change="changeData('vehiclePictures2',-1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')" prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2" @change="changeData('vehiclePictures2', -1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures')">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')"
prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures"
@change="changeData('driverPictures',-1)" :disabled="judgeWrite('driverPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')" prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures" @change="changeData('driverPictures', -1)"
:disabled="judgeWrite('driverPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures1')">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')"
prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1"
@change="changeData('driverPictures1',-1)" :disabled="judgeWrite('driverPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')" prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1" @change="changeData('driverPictures1', -1)"
:disabled="judgeWrite('driverPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures2')">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')"
prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2"
@change="changeData('driverPictures2',-1)" :disabled="judgeWrite('driverPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')" prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2" @change="changeData('driverPictures2', -1)"
:disabled="judgeWrite('driverPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures')">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')"
prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures"
@change="changeData('weighPictures',-1)" :disabled="judgeWrite('weighPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')" prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures" @change="changeData('weighPictures', -1)"
:disabled="judgeWrite('weighPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures1')">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')"
prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1"
@change="changeData('weighPictures1',-1)" :disabled="judgeWrite('weighPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')" prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1" @change="changeData('weighPictures1', -1)"
:disabled="judgeWrite('weighPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures2')">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')"
prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2"
@change="changeData('weighPictures2',-1)" :disabled="judgeWrite('weighPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')" prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2" @change="changeData('weighPictures2', -1)"
:disabled="judgeWrite('weighPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures3')">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')"
prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3"
@change="changeData('weighPictures3',-1)" :disabled="judgeWrite('weighPictures3')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')" prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3" @change="changeData('weighPictures3', -1)"
:disabled="judgeWrite('weighPictures3')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
@ -417,67 +362,55 @@
</div>
<el-table :data="dataForm.voucherVehicleList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')"
prop="vehicleId">
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')" prop="vehicleId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.vehicleId"
@change="changeData('vouchervehicle-vehicleId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-vehicleId')"
@change="changeData('vouchervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-vehicleId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='vehicle_number' :field="'vehicleId'+scope.$index"
interfaceId="529920852288864453" :pageSize="20"
:columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{"width":"100%"}'>
relationField='vehicle_number' :field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
:pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')"
prop="driverName">
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')" prop="driverName">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.driverName"
@change="changeData('vouchervehicle-driverName',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-driverName')"
clearable :style='{"width":"100%"}'>
@change="changeData('vouchervehicle-driverName', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-driverName')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')"
prop="telephone">
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')" prop="telephone">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.telephone"
@change="changeData('vouchervehicle-telephone',scope.$index)"
<JnpfInput v-model="scope.row.telephone" @change="changeData('vouchervehicle-telephone', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-telephone')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-telephone')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')"
prop="carrier">
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')" prop="carrier">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.carrier"
@change="changeData('vouchervehicle-carrier',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-carrier')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.carrier" @change="changeData('vouchervehicle-carrier', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-carrier')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -488,8 +421,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvouchervehicleList()"
v-if="!judgeWrite('vouchervehicleList')">
<div class="table-actions" @click="addvouchervehicleList()" v-if="!judgeWrite('vouchervehicleList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -522,8 +454,8 @@
</el-col> -->
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@ -830,8 +762,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

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

@ -10,15 +10,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="凭证类型">
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
:options="voucherTypeOptions" :props="voucherTypeProps" multiple>
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
:props="voucherTypeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
@ -33,11 +33,10 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -47,11 +46,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -59,8 +56,7 @@
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createPurchaseOrder()">生成采购单
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createReceiptOrder()">生成收货单
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="createReceiptOrder()">生成收货单
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createSaleDeliveryVoucher()">生成销售发货凭证
@ -68,12 +64,10 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -83,17 +77,17 @@
</el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left">
<template slot-scope="scope">
{{ scope.row.documentType1}}
{{ scope.row.documentType1 }}
</template>
</el-table-column>
<el-table-column label="凭证类型" prop="voucherType" algin="left">
<template slot-scope="scope">
{{ scope.row.voucherType1}}
{{ scope.row.voucherType1 }}
</template>
</el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus" algin="left">
<template slot-scope="scope">
{{ scope.row.voucherStatus1}}
{{ scope.row.voucherStatus1 }}
</template>
</el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left">
@ -104,12 +98,12 @@
</el-table-column>
<el-table-column label="运输方式" prop="modeTransport" algin="left">
<template slot-scope="scope">
{{ scope.row.modeTransport1}}
{{ scope.row.modeTransport1 }}
</template>
</el-table-column>
<el-table-column label="承运方式" prop="transportationMethod" algin="left">
<template slot-scope="scope">
{{ scope.row.transportationMethod1}}
{{ scope.row.transportationMethod1 }}
</template>
</el-table-column>
<el-table-column prop="carrier" label="承运商" align="left">
@ -122,59 +116,64 @@
</el-table-column>
<el-table-column prop="associateThirdSuppliers" label="三级供应商" align="left">
<template slot-scope="scope">
{{ scope.row.thirdSupplyName}}
{{ scope.row.thirdSupplyName }}
</template>
</el-table-column>
<el-table-column prop="poundlistTime" 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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>
@ -366,10 +365,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) {
@ -409,6 +408,7 @@ export default {
const selectData = this.multipleSelectionItem
let isSaleFlag = false
selectData.every(function (item) {
debugger
isSaleFlag = item.isSaleDeliveryVoucher == '1'
})
if (!isSaleFlag) {

692
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue
View File

File diff suppressed because it is too large Load Diff

112
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,17 +8,17 @@
<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"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -39,11 +32,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -51,88 +42,107 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="returnCargoCode" label="订单编号" align="left">
<el-table-column prop="returnCargoCode" label="单据编号" align="left">
</el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left">
<el-table-column prop="supplyName" 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="deliveryAddress" label="收货地址" align="left">
<el-table-column prop="returnCargoWay1" label="退货方式" align="left">
<template slot-scope="scope">
{{ scope.row.returnCargoWay1 }}
</template>
</el-table-column>
<el-table-column prop="1" label="计划退货数量" align="left">
</el-table-column>
<el-table-column prop="2" label="已发货数量" align="left">
</el-table-column>
<el-table-column prop="3" label="发货次数" align="left">
</el-table-column>
<el-table-column prop="fixPriceMode1" label="结算方式" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
<el-table-column prop="deliveryType1" label="配送方式" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="收货仓库" align="left">
<el-table-column prop="transportMode1" label="运输方式" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
<el-table-column prop="carriageMode1" label="承运类型" align="left">
</el-table-column>
<el-table-column prop="carrier1" 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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

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

File diff suppressed because it is too large Load Diff

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

@ -17,15 +17,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="业务类型">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
:options="deliveryTypeOptions" :props="deliveryTypeProps">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
:props="deliveryTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -39,11 +39,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -51,12 +49,10 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -68,24 +64,16 @@
</el-table-column>
<el-table-column label="单据类型" prop="deliveryType" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.deliveryType}}
{{ scope.row.deliveryType }}
</template>
</el-table-column>
<el-table-column prop="deliveryStatus" label="单据状态" align="left" fixed="left">
<el-table-column prop="deliveryStatus1" label="单据状态" align="left" fixed="left">
</el-table-column>
<el-table-column prop="businessId" label="关联单据号" align="left">
<el-table-column prop="saleOrder" label="关联单据号" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="发货数量" align="left">
<el-table-column prop="1" label="发货数量" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="已发货数量" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="发货仓库" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
<el-table-column prop="2" label="已发货数量" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column>
@ -99,52 +87,47 @@
</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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

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

@ -2,11 +2,11 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -17,43 +17,38 @@
</el-col>
<el-col :span="8" v-if="judgeShow('voucherCode')">
<jnpf-form-tip-item label="凭证编号" v-if="judgeShow('voucherCode')" prop="voucherCode">
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('voucherCode')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('voucherCode')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherType')">
<jnpf-form-tip-item label="凭证类型" v-if="judgeShow('voucherType')" prop="voucherType">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType',-1)"
placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
:style='{"width":"100%"}' :options="voucherTypeOptions" :props="voucherTypeProps">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType', -1)" placeholder="请选择"
:disabled="judgeWrite('voucherType')" clearable :style='{ "width": "100%" }' :options="voucherTypeOptions"
:props="voucherTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('preparationTime')">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')"
prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime"
@change="changeData('preparationTime',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')" prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime" @change="changeData('preparationTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('associateThirdSuppliers')">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')"
prop="associateThirdSuppliers">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')" prop="associateThirdSuppliers">
<JnpfPopupSelect v-model="dataForm.associateThirdSuppliers"
@change="changeData('associateThirdSuppliers',-1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.associateThirdSuppliers"
placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='associateThirdSuppliers' interfaceId="523899951990705477" :pageSize="20"
:columnOptions="associateThirdSupplierscolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('associateThirdSuppliers', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.associateThirdSuppliers" placeholder="请选择"
:disabled="judgeWrite('associateThirdSuppliers')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='associateThirdSuppliers' interfaceId="530001884988047877"
:pageSize="20" :columnOptions="associateThirdSupplierscolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
@ -64,43 +59,38 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures"
@change="changeData('voucherPictures',-1)" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')" prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures" @change="changeData('voucherPictures', -1)"
:disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
<jnpf-form-tip-item label="磅单编号" v-if="judgeShow('poundCode')" prop="poundCode">
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode',-1)"
placeholder="请输入" :disabled="judgeWrite('poundCode')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode', -1)" placeholder="请输入"
:disabled="judgeWrite('poundCode')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehicleName')">
<jnpf-form-tip-item label="车牌号" v-if="judgeShow('vehicleName')" prop="vehicleName">
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName',-1)"
placeholder="请输入" :disabled="judgeWrite('vehicleName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName', -1)" placeholder="请输入"
:disabled="judgeWrite('vehicleName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('supplierName')">
<jnpf-form-tip-item label="发货单位" v-if="judgeShow('supplierName')" prop="supplierName">
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName',-1)"
placeholder="请输入" :disabled="judgeWrite('supplierName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName', -1)" placeholder="请输入"
:disabled="judgeWrite('supplierName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('customerName')">
<jnpf-form-tip-item label="收货单位" v-if="judgeShow('customerName')" prop="customerName">
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName',-1)"
placeholder="请输入" :disabled="judgeWrite('customerName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName', -1)" placeholder="请输入"
:disabled="judgeWrite('customerName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -111,139 +101,117 @@
</div>
<el-table :data="dataForm.voucherProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')"
prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
<span class="required-sign" v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId"
@change="changeData('voucherproduct-productId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId'+scope.$index"
interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('voucherproduct-productId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('voucherproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('voucherproductList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('voucherproduct-spec',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-spec')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.spec" @change="changeData('voucherproduct-spec', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-spec')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" v-if="judgeShow('voucherproduct-unit')" prop="unit">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-unit')">*</span>单位
<span class="required-sign" v-if="judgeRequired('voucherproductList-unit')">*</span>单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit"
@change="changeData('voucherproduct-unit',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-unit')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.unit" @change="changeData('voucherproduct-unit', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-unit')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')"
prop="grossWeight">
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')" prop="grossWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
<span class="required-sign" v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.grossWeight"
@change="changeData('voucherproduct-grossWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-grossWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-grossWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-grossWeight')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')"
prop="tareWeight">
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')" prop="tareWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
<span class="required-sign" v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.tareWeight"
@change="changeData('voucherproduct-tareWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-tareWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-tareWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-tareWeight')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')"
prop="buckleWeight">
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')" prop="buckleWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
<span class="required-sign" v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.buckleWeight"
@change="changeData('voucherproduct-buckleWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-buckleWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')"
prop="netWeight">
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')" prop="netWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
<span class="required-sign" v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.netWeight"
@change="changeData('voucherproduct-netWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-netWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-netWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-netWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('voucherproduct-remark')" prop="remark">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-remark')">*</span>备注
<span class="required-sign" v-if="judgeRequired('voucherproductList-remark')">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('voucherproduct-remark',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-remark')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.remark" @change="changeData('voucherproduct-remark', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-remark')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')"
prop="printTime">
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')" prop="printTime">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
<span class="required-sign" v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.printTime"
@change="changeData('voucherproduct-printTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
@change="changeData('voucherproduct-printTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-printTime')"
clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-printTime')" clearable
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
@ -254,8 +222,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvoucherproductList()"
v-if="!judgeWrite('voucherproductList')">
<div class="table-actions" @click="addvoucherproductList()" v-if="!judgeWrite('voucherproductList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -268,145 +235,126 @@
</el-col>
<el-col :span="8" v-if="judgeShow('modeTransport')">
<jnpf-form-tip-item label="运输方式" v-if="judgeShow('modeTransport')" prop="modeTransport">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport',-1)"
placeholder="请选择" :disabled="judgeWrite('modeTransport')" clearable
:style='{"width":"100%"}' :options="modeTransportOptions"
:props="modeTransportProps">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport', -1)" placeholder="请选择"
:disabled="judgeWrite('modeTransport')" clearable :style='{ "width": "100%" }'
:options="modeTransportOptions" :props="modeTransportProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('transportationMethod')">
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')"
prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod"
@change="changeData('transportationMethod',-1)" placeholder="请选择"
:disabled="judgeWrite('transportationMethod')" clearable :style='{"width":"100%"}'
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')" prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod" @change="changeData('transportationMethod', -1)"
placeholder="请选择" :disabled="judgeWrite('transportationMethod')" clearable :style='{ "width": "100%" }'
:options="transportationMethodOptions" :props="transportationMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('carrier')">
<jnpf-form-tip-item label="承运商" v-if="judgeShow('carrier')" prop="carrier">
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier',-1)"
placeholder="请输入" :disabled="judgeWrite('carrier')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier', -1)" placeholder="请输入"
:disabled="judgeWrite('carrier')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('placeDispatch')">
<jnpf-form-tip-item label="起运地" v-if="judgeShow('placeDispatch')" prop="placeDispatch">
<JnpfAreaSelect v-model="dataForm.placeDispatch"
@change="changeData('placeDispatch',-1)" placeholder="请选择" selectType="all"
:disabled="judgeWrite('placeDispatch')" clearable :style='{"width":"100%"}'
<JnpfAreaSelect v-model="dataForm.placeDispatch" @change="changeData('placeDispatch', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('placeDispatch')" clearable :style='{ "width": "100%" }'
:level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('destination')">
<jnpf-form-tip-item label="到达地" v-if="judgeShow('destination')" prop="destination">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination',-1)"
placeholder="请选择" selectType="all" :disabled="judgeWrite('destination')" clearable
:style='{"width":"100%"}' :level="2">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('destination')" clearable :style='{ "width": "100%" }' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="运费" v-if="judgeShow('freight')" prop="freight">
<JnpfInput v-model="dataForm.freight" @change="changeData('freight',-1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.freight" @change="changeData('freight', -1)" placeholder="请输入"
:disabled="judgeWrite('freight')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures')">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')"
prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures',-1)" :disabled="judgeWrite('vehiclePictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')" prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures" @change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures1')">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')"
prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1"
@change="changeData('vehiclePictures1',-1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')" prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1" @change="changeData('vehiclePictures1', -1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures2')">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')"
prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2"
@change="changeData('vehiclePictures2',-1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')" prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2" @change="changeData('vehiclePictures2', -1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures')">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')"
prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures"
@change="changeData('driverPictures',-1)" :disabled="judgeWrite('driverPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')" prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures" @change="changeData('driverPictures', -1)"
:disabled="judgeWrite('driverPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures1')">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')"
prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1"
@change="changeData('driverPictures1',-1)" :disabled="judgeWrite('driverPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')" prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1" @change="changeData('driverPictures1', -1)"
:disabled="judgeWrite('driverPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures2')">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')"
prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2"
@change="changeData('driverPictures2',-1)" :disabled="judgeWrite('driverPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')" prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2" @change="changeData('driverPictures2', -1)"
:disabled="judgeWrite('driverPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures')">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')"
prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures"
@change="changeData('weighPictures',-1)" :disabled="judgeWrite('weighPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')" prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures" @change="changeData('weighPictures', -1)"
:disabled="judgeWrite('weighPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures1')">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')"
prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1"
@change="changeData('weighPictures1',-1)" :disabled="judgeWrite('weighPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')" prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1" @change="changeData('weighPictures1', -1)"
:disabled="judgeWrite('weighPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures2')">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')"
prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2"
@change="changeData('weighPictures2',-1)" :disabled="judgeWrite('weighPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')" prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2" @change="changeData('weighPictures2', -1)"
:disabled="judgeWrite('weighPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures3')">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')"
prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3"
@change="changeData('weighPictures3',-1)" :disabled="judgeWrite('weighPictures3')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')" prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3" @change="changeData('weighPictures3', -1)"
:disabled="judgeWrite('weighPictures3')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
@ -417,67 +365,55 @@
</div>
<el-table :data="dataForm.voucherVehicleList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')"
prop="vehicleId">
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')" prop="vehicleId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.vehicleId"
@change="changeData('vouchervehicle-vehicleId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-vehicleId')"
@change="changeData('vouchervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-vehicleId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='vehicle_number' :field="'vehicleId'+scope.$index"
interfaceId="529920852288864453" :pageSize="20"
:columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{"width":"100%"}'>
relationField='vehicle_number' :field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
:pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')"
prop="driverName">
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')" prop="driverName">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.driverName"
@change="changeData('vouchervehicle-driverName',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-driverName')"
clearable :style='{"width":"100%"}'>
@change="changeData('vouchervehicle-driverName', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-driverName')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')"
prop="telephone">
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')" prop="telephone">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.telephone"
@change="changeData('vouchervehicle-telephone',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-telephone')"
clearable :style='{"width":"100%"}'>
@change="changeData('vouchervehicle-telephone', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-telephone')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')"
prop="carrier">
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')" prop="carrier">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.carrier"
@change="changeData('vouchervehicle-carrier',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-carrier')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.carrier" @change="changeData('vouchervehicle-carrier', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-carrier')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -488,8 +424,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvouchervehicleList()"
v-if="!judgeWrite('vouchervehicleList')">
<div class="table-actions" @click="addvouchervehicleList()" v-if="!judgeWrite('vouchervehicleList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -522,8 +457,8 @@
</el-col> -->
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@ -607,6 +542,7 @@ export default {
Vmodel: "",
currVmodel: "",
dataForm: {
isSaleDeliveryVoucherSource: undefined,
voucherCode: undefined,
voucherType: undefined,
preparationTime: undefined,
@ -837,13 +773,14 @@ export default {
initPurchaseData() {
const data = this.setting.selectData
if (data.flag == '采购收货凭证生成销售发货凭证') {
// data.forEach(item => {
// debugger
// item.voucherId = item.id
// this.dataForm.deliveryProductRelationList = []
// this.dataForm.deliveryVoucherRelationList.push(item)
// this.dataForm.deliveryProductRelationList = item.voucherProductList
// });
data.forEach(item => {
debugger
this.dataForm.isSaleDeliveryVoucherSource = item.id
// item.voucherId = item.id
this.dataForm.deliveryProductRelationList = []
this.dataForm.deliveryVoucherRelationList.push(item)
this.dataForm.deliveryProductRelationList = item.voucherProductList
});
}
},
changeData(model, index) {

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

@ -10,15 +10,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="凭证类型">
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
:options="voucherTypeOptions" :props="voucherTypeProps" multiple>
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
:props="voucherTypeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
@ -33,11 +33,10 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -47,17 +46,14 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createSaleOrder()">生成销售单
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="createSaleOrder()">生成销售单
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createDeliveryOrder()">生成发货单
@ -68,12 +64,10 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -81,35 +75,35 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="voucherCode" label="凭证编号" align="left" fixed="left">
</el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left" fixed="left">
<el-table-column label="单据类型" prop="documentType1" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.documentType}}
{{ scope.row.documentType1 }}
</template>
</el-table-column>
<el-table-column label="凭证类型" prop="voucherType" algin="left" fixed="left">
<el-table-column label="凭证类型" prop="voucherType1" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.voucherType}}
{{ scope.row.voucherType1 }}
</template>
</el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus" algin="left" fixed="left">
<el-table-column label="凭证状态" prop="voucherStatus1" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.voucherStatus}}
{{ scope.row.voucherStatus1 }}
</template>
</el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left">
</el-table-column>
<el-table-column prop="associatedDocumentNo" label="关联单据号" align="left">
<el-table-column prop="purchaseDeliveryOrder" label="关联单据号" align="left">
</el-table-column>
<el-table-column prop="vehicleName" label="车牌号" align="left">
<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">
@ -134,52 +128,47 @@
</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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>
@ -336,7 +325,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 +357,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 +402,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) {

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

@ -10,15 +10,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="业务类型">
<JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable
:options="receiptTypeOptions" :props="receiptTypeProps">
<JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable :options="receiptTypeOptions"
:props="receiptTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -32,11 +32,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -44,12 +42,10 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -57,75 +53,77 @@
@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">
</el-table-column>
<el-table-column label="单据类型" prop="receiptType1" 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.receiptType}}
{{ scope.row.receiptStatus1 }}
</template>
</el-table-column>
<el-table-column prop="returnCargoOrder" label="退货单" align="left">
</el-table-column>
<!-- <el-table-column prop="reservedFields1" label="业务线" align="left">
</el-table-column> -->
<el-table-column prop="subjectId" label="客户名称" align="left">
<el-table-column prop="1" label="收货数量" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">
<el-table-column prop="2" label="已收货数量" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
<el-table-column prop="preparationTime" label="制单时间" align="left">
</el-table-column>
<el-table-column prop="receiptWarehouse" label="收货仓库" align="left">
<el-table-column prop="creatorUserId" label="提交人" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
<el-table-column prop="creatorTime" label="提交时间" align="left">
</el-table-column>
<el-table-column prop="preparationTime" label="制单时间" align="left">
<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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

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

@ -2,11 +2,11 @@
<template>
<div :style="{margin: '0 auto',width:'100%'}">
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
:disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -17,43 +17,37 @@
</el-col>
<el-col :span="8" v-if="judgeShow('voucherCode')">
<jnpf-form-tip-item label="凭证编号" v-if="judgeShow('voucherCode')" prop="voucherCode">
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode',-1)"
placeholder="系统自动生成" :disabled="judgeWrite('voucherCode')" readonly
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.voucherCode" @change="changeData('voucherCode', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('voucherCode')" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherType')">
<jnpf-form-tip-item label="凭证类型" v-if="judgeShow('voucherType')" prop="voucherType">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType',-1)"
placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
:style='{"width":"100%"}' :options="voucherTypeOptions" :props="voucherTypeProps">
<JnpfSelect v-model="dataForm.voucherType" @change="changeData('voucherType', -1)" placeholder="请选择"
:disabled="judgeWrite('voucherType')" clearable :style='{ "width": "100%" }' :options="voucherTypeOptions"
:props="voucherTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('preparationTime')">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')"
prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime"
@change="changeData('preparationTime',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd">
<jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')" prop="preparationTime">
<JnpfDatePicker v-model="dataForm.preparationTime" @change="changeData('preparationTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('preparationTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('associateThirdSuppliers')">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')"
prop="associateThirdSuppliers">
<jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')" prop="associateThirdSuppliers">
<JnpfPopupSelect v-model="dataForm.associateThirdSuppliers"
@change="changeData('associateThirdSuppliers',-1)" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.associateThirdSuppliers"
placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='associateThirdSuppliers' interfaceId="523899951990705477" :pageSize="20"
:columnOptions="associateThirdSupplierscolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('associateThirdSuppliers', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.associateThirdSuppliers" placeholder="请选择"
:disabled="judgeWrite('associateThirdSuppliers')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='associateThirdSuppliers' interfaceId="530001884988047877"
:pageSize="20" :columnOptions="associateThirdSupplierscolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
@ -64,43 +58,38 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures"
@change="changeData('voucherPictures',-1)" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')" prop="voucherPictures">
<JnpfUploadImg v-model="dataForm.voucherPictures" @change="changeData('voucherPictures', -1)"
:disabled="judgeWrite('voucherPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
<jnpf-form-tip-item label="磅单编号" v-if="judgeShow('poundCode')" prop="poundCode">
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode',-1)"
placeholder="请输入" :disabled="judgeWrite('poundCode')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.poundCode" @change="changeData('poundCode', -1)" placeholder="请输入"
:disabled="judgeWrite('poundCode')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehicleName')">
<jnpf-form-tip-item label="车牌号" v-if="judgeShow('vehicleName')" prop="vehicleName">
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName',-1)"
placeholder="请输入" :disabled="judgeWrite('vehicleName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.vehicleName" @change="changeData('vehicleName', -1)" placeholder="请输入"
:disabled="judgeWrite('vehicleName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('supplierName')">
<jnpf-form-tip-item label="发货单位" v-if="judgeShow('supplierName')" prop="supplierName">
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName',-1)"
placeholder="请输入" :disabled="judgeWrite('supplierName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.supplierName" @change="changeData('supplierName', -1)" placeholder="请输入"
:disabled="judgeWrite('supplierName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('customerName')">
<jnpf-form-tip-item label="收货单位" v-if="judgeShow('customerName')" prop="customerName">
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName',-1)"
placeholder="请输入" :disabled="judgeWrite('customerName')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.customerName" @change="changeData('customerName', -1)" placeholder="请输入"
:disabled="judgeWrite('customerName')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -111,139 +100,116 @@
</div>
<el-table :data="dataForm.voucherProductList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')"
prop="productId">
<el-table-column label="商品名称" v-if="judgeShow('voucherproduct-productId')" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
<span class="required-sign" v-if="judgeRequired('voucherproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId"
@change="changeData('voucherproduct-productId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :field="'productId'+scope.$index"
interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable
:style='{"width":"100%"}'>
@change="changeData('voucherproduct-productId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.voucherproductproductId" placeholder="请选择"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-productId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
:columnOptions="voucherproductproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="规格" v-if="judgeShow('voucherproduct-spec')" prop="spec">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-spec')">*</span>规格
<span class="required-sign" v-if="judgeRequired('voucherproductList-spec')">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('voucherproduct-spec',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-spec')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.spec" @change="changeData('voucherproduct-spec', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-spec')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" v-if="judgeShow('voucherproduct-unit')" prop="unit">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-unit')">*</span>单位
<span class="required-sign" v-if="judgeRequired('voucherproductList-unit')">*</span>单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit"
@change="changeData('voucherproduct-unit',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-unit')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.unit" @change="changeData('voucherproduct-unit', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-unit')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')"
prop="grossWeight">
<el-table-column label="毛重" v-if="judgeShow('voucherproduct-grossWeight')" prop="grossWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
<span class="required-sign" v-if="judgeRequired('voucherproductList-grossWeight')">*</span>毛重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.grossWeight"
@change="changeData('voucherproduct-grossWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-grossWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-grossWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-grossWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')"
prop="tareWeight">
<el-table-column label="皮重" v-if="judgeShow('voucherproduct-tareWeight')" prop="tareWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
<span class="required-sign" v-if="judgeRequired('voucherproductList-tareWeight')">*</span>皮重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.tareWeight"
@change="changeData('voucherproduct-tareWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-tareWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-tareWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-tareWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')"
prop="buckleWeight">
<el-table-column label="扣重" v-if="judgeShow('voucherproduct-buckleWeight')" prop="buckleWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
<span class="required-sign" v-if="judgeRequired('voucherproductList-buckleWeight')">*</span>扣重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.buckleWeight"
@change="changeData('voucherproduct-buckleWeight',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{"width":"100%"}'>
@change="changeData('voucherproduct-buckleWeight', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-buckleWeight')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')"
prop="netWeight">
<el-table-column label="净重" v-if="judgeShow('voucherproduct-netWeight')" prop="netWeight">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
<span class="required-sign" v-if="judgeRequired('voucherproductList-netWeight')">*</span>净重
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.netWeight"
@change="changeData('voucherproduct-netWeight',scope.$index)"
<JnpfInput v-model="scope.row.netWeight" @change="changeData('voucherproduct-netWeight', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-netWeight')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-netWeight')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('voucherproduct-remark')" prop="remark">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-remark')">*</span>备注
<span class="required-sign" v-if="judgeRequired('voucherproductList-remark')">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('voucherproduct-remark',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-remark')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.remark" @change="changeData('voucherproduct-remark', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-remark')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')"
prop="printTime">
<el-table-column label="打印时间" v-if="judgeShow('voucherproduct-printTime')" prop="printTime">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
<span class="required-sign" v-if="judgeRequired('voucherproductList-printTime')">*</span>打印时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.printTime"
@change="changeData('voucherproduct-printTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择"
:disabled="judgeWrite('voucherproductList')||judgeWrite('voucherproductList-printTime')"
clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
@change="changeData('voucherproduct-printTime', scope.$index)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-printTime')" clearable
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
@ -254,8 +220,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvoucherproductList()"
v-if="!judgeWrite('voucherproductList')">
<div class="table-actions" @click="addvoucherproductList()" v-if="!judgeWrite('voucherproductList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -268,145 +233,125 @@
</el-col>
<el-col :span="8" v-if="judgeShow('modeTransport')">
<jnpf-form-tip-item label="运输方式" v-if="judgeShow('modeTransport')" prop="modeTransport">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport',-1)"
placeholder="请选择" :disabled="judgeWrite('modeTransport')" clearable
:style='{"width":"100%"}' :options="modeTransportOptions"
:props="modeTransportProps">
<JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport', -1)" placeholder="请选择"
:disabled="judgeWrite('modeTransport')" clearable :style='{ "width": "100%" }'
:options="modeTransportOptions" :props="modeTransportProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('transportationMethod')">
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')"
prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod"
@change="changeData('transportationMethod',-1)" placeholder="请选择"
:disabled="judgeWrite('transportationMethod')" clearable :style='{"width":"100%"}'
<jnpf-form-tip-item label="承运方式" v-if="judgeShow('transportationMethod')" prop="transportationMethod">
<JnpfSelect v-model="dataForm.transportationMethod" @change="changeData('transportationMethod', -1)"
placeholder="请选择" :disabled="judgeWrite('transportationMethod')" clearable :style='{ "width": "100%" }'
:options="transportationMethodOptions" :props="transportationMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('carrier')">
<jnpf-form-tip-item label="承运商" v-if="judgeShow('carrier')" prop="carrier">
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier',-1)"
placeholder="请输入" :disabled="judgeWrite('carrier')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.carrier" @change="changeData('carrier', -1)" placeholder="请输入"
:disabled="judgeWrite('carrier')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('placeDispatch')">
<jnpf-form-tip-item label="起运地" v-if="judgeShow('placeDispatch')" prop="placeDispatch">
<JnpfAreaSelect v-model="dataForm.placeDispatch"
@change="changeData('placeDispatch',-1)" placeholder="请选择" selectType="all"
:disabled="judgeWrite('placeDispatch')" clearable :style='{"width":"100%"}'
:level="2">
<JnpfAreaSelect v-model="dataForm.placeDispatch" @change="changeData('placeDispatch', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('placeDispatch')" clearable :style='{ "width": "100%" }' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('destination')">
<jnpf-form-tip-item label="到达地" v-if="judgeShow('destination')" prop="destination">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination',-1)"
placeholder="请选择" selectType="all" :disabled="judgeWrite('destination')" clearable
:style='{"width":"100%"}' :level="2">
<JnpfAreaSelect v-model="dataForm.destination" @change="changeData('destination', -1)" placeholder="请选择"
selectType="all" :disabled="judgeWrite('destination')" clearable :style='{ "width": "100%" }' :level="2">
</JnpfAreaSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('freight')">
<jnpf-form-tip-item label="运费" v-if="judgeShow('freight')" prop="freight">
<JnpfInput v-model="dataForm.freight" @change="changeData('freight',-1)"
placeholder="请输入" :disabled="judgeWrite('freight')" clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.freight" @change="changeData('freight', -1)" placeholder="请输入"
:disabled="judgeWrite('freight')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures')">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')"
prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures',-1)" :disabled="judgeWrite('vehiclePictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆信息" v-if="judgeShow('vehiclePictures')" prop="vehiclePictures">
<JnpfUploadImg v-model="dataForm.vehiclePictures" @change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures1')">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')"
prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1"
@change="changeData('vehiclePictures1',-1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆45度图片" v-if="judgeShow('vehiclePictures1')" prop="vehiclePictures1">
<JnpfUploadImg v-model="dataForm.vehiclePictures1" @change="changeData('vehiclePictures1', -1)"
:disabled="judgeWrite('vehiclePictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('vehiclePictures2')">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')"
prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2"
@change="changeData('vehiclePictures2',-1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9"
pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="车辆货物图片" v-if="judgeShow('vehiclePictures2')" prop="vehiclePictures2">
<JnpfUploadImg v-model="dataForm.vehiclePictures2" @change="changeData('vehiclePictures2', -1)"
:disabled="judgeWrite('vehiclePictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures')">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')"
prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures"
@change="changeData('driverPictures',-1)" :disabled="judgeWrite('driverPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息" v-if="judgeShow('driverPictures')" prop="driverPictures">
<JnpfUploadImg v-model="dataForm.driverPictures" @change="changeData('driverPictures', -1)"
:disabled="judgeWrite('driverPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures1')">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')"
prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1"
@change="changeData('driverPictures1',-1)" :disabled="judgeWrite('driverPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息行驶证图片" v-if="judgeShow('driverPictures1')" prop="driverPictures1">
<JnpfUploadImg v-model="dataForm.driverPictures1" @change="changeData('driverPictures1', -1)"
:disabled="judgeWrite('driverPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('driverPictures2')">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')"
prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2"
@change="changeData('driverPictures2',-1)" :disabled="judgeWrite('driverPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="驾驶员信息身份证图片" v-if="judgeShow('driverPictures2')" prop="driverPictures2">
<JnpfUploadImg v-model="dataForm.driverPictures2" @change="changeData('driverPictures2', -1)"
:disabled="judgeWrite('driverPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures')">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')"
prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures"
@change="changeData('weighPictures',-1)" :disabled="judgeWrite('weighPictures')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息正面图片" v-if="judgeShow('weighPictures')" prop="weighPictures">
<JnpfUploadImg v-model="dataForm.weighPictures" @change="changeData('weighPictures', -1)"
:disabled="judgeWrite('weighPictures')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures1')">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')"
prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1"
@change="changeData('weighPictures1',-1)" :disabled="judgeWrite('weighPictures1')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息后面图片" v-if="judgeShow('weighPictures1')" prop="weighPictures1">
<JnpfUploadImg v-model="dataForm.weighPictures1" @change="changeData('weighPictures1', -1)"
:disabled="judgeWrite('weighPictures1')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures2')">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')"
prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2"
@change="changeData('weighPictures2',-1)" :disabled="judgeWrite('weighPictures2')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息过磅图片" v-if="judgeShow('weighPictures2')" prop="weighPictures2">
<JnpfUploadImg v-model="dataForm.weighPictures2" @change="changeData('weighPictures2', -1)"
:disabled="judgeWrite('weighPictures2')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('weighPictures3')">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')"
prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3"
@change="changeData('weighPictures3',-1)" :disabled="judgeWrite('weighPictures3')"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
<jnpf-form-tip-item label="过磅信息货物图片" v-if="judgeShow('weighPictures3')" prop="weighPictures3">
<JnpfUploadImg v-model="dataForm.weighPictures3" @change="changeData('weighPictures3', -1)"
:disabled="judgeWrite('weighPictures3')" :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
@ -417,67 +362,55 @@
</div>
<el-table :data="dataForm.voucherVehicleList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')"
prop="vehicleId">
<el-table-column label="车牌号" v-if="judgeShow('vouchervehicle-vehicleId')" prop="vehicleId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-vehicleId')">*</span>车牌号
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.vehicleId"
@change="changeData('vouchervehicle-vehicleId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-vehicleId')"
@change="changeData('vouchervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-vehicleId')"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='vehicle_number' :field="'vehicleId'+scope.$index"
interfaceId="529920852288864453" :pageSize="20"
:columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{"width":"100%"}'>
relationField='vehicle_number' :field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
:pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')"
prop="driverName">
<el-table-column label="驾驶员名称" v-if="judgeShow('vouchervehicle-driverName')" prop="driverName">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-driverName')">*</span>驾驶员名称
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.driverName"
@change="changeData('vouchervehicle-driverName',scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-driverName')"
clearable :style='{"width":"100%"}'>
@change="changeData('vouchervehicle-driverName', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-driverName')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')"
prop="telephone">
<el-table-column label="联系电话" v-if="judgeShow('vouchervehicle-telephone')" prop="telephone">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-telephone')">*</span>联系电话
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.telephone"
@change="changeData('vouchervehicle-telephone',scope.$index)"
<JnpfInput v-model="scope.row.telephone" @change="changeData('vouchervehicle-telephone', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-telephone')"
clearable :style='{"width":"100%"}'>
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-telephone')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')"
prop="carrier">
<el-table-column label="承运商" v-if="judgeShow('vouchervehicle-carrier')" prop="carrier">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
<span class="required-sign" v-if="judgeRequired('vouchervehicleList-carrier')">*</span>承运商
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.carrier"
@change="changeData('vouchervehicle-carrier',scope.$index)" placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList')||judgeWrite('vouchervehicleList-carrier')"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.carrier" @change="changeData('vouchervehicle-carrier', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-carrier')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -488,8 +421,7 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addvouchervehicleList()"
v-if="!judgeWrite('vouchervehicleList')">
<div class="table-actions" @click="addvouchervehicleList()" v-if="!judgeWrite('vouchervehicleList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -522,8 +454,8 @@
</el-col> -->
<!-- 表单结束 -->
</template>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />

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

@ -17,15 +17,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="凭证类型">
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
:options="voucherTypeOptions" :props="voucherTypeProps" multiple>
<JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
:props="voucherTypeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
@ -40,11 +40,10 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -54,11 +53,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -72,12 +69,10 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -85,19 +80,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">
@ -106,14 +101,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">
@ -124,58 +119,63 @@
</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="supplyName" label="三级供应商" align="left">
</el-table-column>
<el-table-column prop="poundlistTime" 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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>
@ -340,6 +340,7 @@ export default {
return
}
const selectData = this.multipleSelectionItem
debugger
if (!this.deliveryVoucherFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.deliveryVoucherFlowList.length === 1) {

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

@ -10,15 +10,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.documentType" placeholder="请选择" clearable
:options="documentTypeOptions" :props="documentTypeProps">
<JnpfSelect v-model="query.documentType" placeholder="请选择" clearable :options="documentTypeOptions"
:props="documentTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -32,11 +32,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -44,12 +42,10 @@
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -57,77 +53,100 @@
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="returnCargoCode" label="单据编号" align="left">
</el-table-column>
<el-table-column prop="subjectId" label="客户名称" align="left">
<el-table-column prop="supplyName" 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 prop="documentStatus" label="单据状态" align="left">
<el-table-column prop="documentStatus1" label="单据状态" align="left">
<template slot-scope="scope">
{{ scope.row.documentStatus1 }}
</template>
</el-table-column>
<el-table-column prop="purchaseOrder" label="关联单据号" align="left">
</el-table-column>
<el-table-column prop="urgentOrder1" label="紧急订单" align="left">
</el-table-column>
<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="businessId" label="关联单据号" align="left">
<el-table-column prop="1" label="计划退货数量" align="left">
</el-table-column>
<el-table-column prop="reservedFields1" label="业务线" align="left">
<el-table-column prop="2" label="已收货数量" align="left">
</el-table-column>
<el-table-column prop="deliveryAddress" label="收货地址" align="left">
<el-table-column prop="3" label="收货次数" align="left">
</el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left">
<el-table-column prop="saleMode1" label="销售模式" align="left">
</el-table-column>
<el-table-column prop="warehouseId" label="收货仓库" align="left">
<el-table-column prop="fixPriceMode1" label="结算模式" align="left">
</el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left">
<el-table-column prop="deliveryType1" label="配送方式" align="left">
</el-table-column>
<el-table-column prop="transportMode1" label="运输方式" align="left">
</el-table-column>
<el-table-column prop="carriageMode1" label="承运类型" align="left">
</el-table-column>
<el-table-column prop="carrier1" 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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

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

@ -24,12 +24,12 @@
</el-dropdown> -->
<!-- <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保 存</el-button> -->
<el-button type="primary" @click="createRedeliveryOrder()" :loading="btnLoading"
:disabled='continueBtnLoading'> 生成补送单 </el-button>
<el-button type="primary" @click="createRedeliveryOrder()" :loading="btnLoading" :disabled='continueBtnLoading'>
生成补送单 </el-button>
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
@ -42,16 +42,15 @@
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="发货仓库" prop="deliveryWarehouse">
<JnpfInput v-model="dataForm.deliveryWarehouse"
@change="changeData('deliveryWarehouse',-1)" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.deliveryWarehouse" @change="changeData('deliveryWarehouse', -1)"
placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="选择订单数量" prop="orderNum">
<JnpfInput v-model="dataForm.orderNum" @change="changeData('orderNum',-1)"
placeholder="请输入" disabled clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.orderNum" @change="changeData('orderNum', -1)" placeholder="请输入" disabled
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -74,8 +73,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.code"
@change="changeData('businessordervoucherrelational-orderId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessordervoucherrelational-orderId', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -85,8 +84,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.code"
@change="changeData('businessordervoucherrelational-voucherId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessordervoucherrelational-voucherId', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -96,8 +95,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.deliveryWarehouse"
@change="changeData('businessordervoucherrelational-orderType',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessordervoucherrelational-orderType', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -107,9 +106,8 @@
</template>
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.urgentOrder"
@change="changeData('businessordervoucherrelational-cargoAreaId',scope.$index)"
placeholder="请选择" clearable :style='{"width":"100%"}'
:options="businessordervoucherrelationalcargoAreaIdOptions"
@change="changeData('businessordervoucherrelational-cargoAreaId', scope.$index)" placeholder="请选择"
clearable :style='{ "width": "100%" }' :options="businessordervoucherrelationalcargoAreaIdOptions"
:props="businessordervoucherrelationalcargoAreaIdProps">
</JnpfSelect>
</template>
@ -121,10 +119,9 @@
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.creatorTime"
@change="changeData('businessordervoucherrelational-creatorTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
format="yyyy-MM-dd">
@change="changeData('businessordervoucherrelational-creatorTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
@ -135,10 +132,9 @@
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.lastModifyTime"
@change="changeData('businessordervoucherrelational-lastModifyTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
format="yyyy-MM-dd">
@change="changeData('businessordervoucherrelational-lastModifyTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
@ -149,10 +145,9 @@
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.deleteTime"
@change="changeData('businessordervoucherrelational-deleteTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
format="yyyy-MM-dd">
@change="changeData('businessordervoucherrelational-deleteTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>
@ -187,8 +182,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.name"
@change="changeData('businessorderproductrelational-productId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-productId', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -198,8 +193,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.businessOrderId"
@change="changeData('businessorderproductrelational-businessOrderId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-businessOrderId', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -209,8 +204,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec"
@change="changeData('businessorderproductrelational-spec',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-spec', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -220,8 +215,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unitId"
@change="changeData('businessorderproductrelational-unitId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-unitId', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -231,8 +226,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.salesMainUnitId"
@change="changeData('businessorderproductrelational-salesMainUnitId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-salesMainUnitId', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -242,8 +237,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.realBound"
@change="changeData('businessorderproductrelational-realBound',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-realBound', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -253,8 +248,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.useBound"
@change="changeData('businessorderproductrelational-useBound',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-useBound', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -264,8 +259,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.creatorTime"
@change="changeData('businessorderproductrelational-creatorTime',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-creatorTime', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -275,8 +270,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.creatorUserId"
@change="changeData('businessorderproductrelational-creatorUserId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-creatorUserId', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -286,8 +281,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.businessPrice"
@change="changeData('businessorderproductrelational-businessPrice',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-businessPrice', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -297,8 +292,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.businessNum"
@change="changeData('businessorderproductrelational-businessNum',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-businessNum', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -308,8 +303,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.lastModifyUserId"
@change="changeData('businessorderproductrelational-lastModifyUserId',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businessorderproductrelational-lastModifyUserId', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -328,8 +323,8 @@
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
<RedeliveryOrder v-if="redeliveryOrderVisible" ref="RedeliveryOrder" />
</el-row>
</div>
@ -347,11 +342,19 @@ import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
import RedeliveryOrder from './redeliveryOrder.vue'
import { getFormById } from '@/api/workFlow/FormDesign'
import { getFlowList } from '@/api/workFlow/FlowEngine'
import FlowBox from '@/views/workFlow/components/FlowBox'
export default {
components: { RedeliveryOrder },
components: { RedeliveryOrder, FlowBox },
props: [],
data() {
return {
flowVisible: false,
flowListVisible: false,
flowList: [],
columnOptions: [],
redeliveryFlowList: [],
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
@ -470,19 +473,40 @@ export default {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
getFormById("524130475623583109").then(res1 => {
let redeliveryFlowId = res1.data && res1.data.id
getFlowList(redeliveryFlowId, '1').then(res2 => {
this.redeliveryFlowList = res2.data
}).catch((e) => {
this.$message({ type: 'error', message: e.message });
this.$router.push('/404');
})
})
},
mounted() { },
methods: {
createRedeliveryOrder() {
this.redeliveryOrderVisible = true
// this.$nextTick(() => {
// console.log(this.dataForm);
// console.log(this.redeliveryOrderVisible);
// this.$refs.RedeliveryOrder.init(this.dataForm)
// })
this.$router.push({
path: '/scm/saleCenter/saleOrder/redeliveryOrder',
params: this.dataForm
const data = this.dataForm
if (!this.redeliveryFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.redeliveryFlowList.length === 1) {
this.selectFlow1(this.redeliveryFlowList[0], data)
} 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)
})
},
prev() {

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

File diff suppressed because it is too large Load Diff

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

@ -5,8 +5,8 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
:options="orderTypeOptions" :props="orderTypeProps">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable :options="orderTypeOptions"
:props="orderTypeProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -17,29 +17,29 @@
</el-col>
<el-col :span="6">
<el-form-item label="是否紧急">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable
:options="urgentOrderOptions" :props="urgentOrderProps">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable :options="urgentOrderOptions"
:props="urgentOrderProps">
</JnpfSelect>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送方式">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
:options="deliveryTypeOptions" :props="deliveryTypeProps" multiple>
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
:props="deliveryTypeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<JnpfSelect v-model="query.status" placeholder="请选择" clearable
:options="statusOptions" :props="statusProps" multiple>
<JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
:props="statusProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
@ -48,11 +48,10 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -62,33 +61,27 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="boundCheck()">库存检查
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="boundLock()">库存锁定
<!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundCheck()">库存检查
</el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundLock()">库存锁定
</el-button> -->
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createPurchaseOrder()">生成采购订单
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" @click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
@ -100,19 +93,19 @@
</el-table-column>
<el-table-column label="单据类型" prop="orderType" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.orderType1}}
{{ scope.row.orderType1 }}
</template>
</el-table-column>
<el-table-column label="单据状态" prop="status" algin="left" fixed="left">
<template slot-scope="scope">
{{ scope.row.saleStatus}}
{{ scope.row.saleStatus }}
</template>
</el-table-column>
<el-table-column prop="purchaseCode" label="关联单据号" align="left">
</el-table-column>
<el-table-column prop="purchaseStatus" label="关联单据状态" align="left" width="100px">
<template slot-scope="scope">
{{ scope.row.purchaseStatus}}
{{ scope.row.purchaseStatus }}
</template>
</el-table-column>
<el-table-column prop="contractNumber" label="关联合同号" align="left">
@ -121,7 +114,7 @@
</el-table-column>
<el-table-column label="是否紧急" prop="urgentOrder" algin="left">
<template slot-scope="scope">
{{ scope.row.urgentOrder1}}
{{ scope.row.urgentOrder1 }}
</template>
</el-table-column>
<el-table-column prop="wareHouseName" label="发货仓库" align="left">
@ -140,52 +133,47 @@
</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>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<BoundCheck v-if="boundCheckVisible" ref="BoundCheck" @refresh="initData" />
<BoundLock v-if="boundLockVisible" ref="BoundLock" @refresh="initData" />
</div>

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

@ -476,6 +476,7 @@
<el-table-column label="操作" width="50" v-if="!judgeWrite('workorderprimaryList')">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delworkorderprimaryList(scope.$index)">删除</el-button>

80
jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
Unescape View File

@ -90,6 +90,19 @@
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 2" type="text" @click="addOstarts(scope.row.id)"
v-has="'btn_starts'">加工
</el-button>
<el-button v-if="scope.row.status == 3" type="text" @click="addOstartsEnd(scope.row.id)"
v-has="'btn_starts'">完成
</el-button>
<el-button v-if="scope.row.status == 3 || scope.row.status == 2" type="text"
@click="addOstartsRescind(scope.row.id)" v-has="'btn_starts'">取消加工
</el-button>
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
@ -479,6 +492,73 @@ export default {
}).catch(() => {
})
},
addOstarts(id, status) {
this.$confirm("此操作将进行加工, 是否继续?", "提示", {
type: "warning",
})
.then(() => {
status = '3',
request({
url: `/api/scm/WorkOrder/closestatus/${id}/${status}`,
method: "Post",
}).then((res) => {
this.$message({
type: "success",
message: res.msg,
onClose: () => {
this.initData();
},
});
});
})
.catch(() => { });
},
addOstartsEnd(id, status) {
this.$confirm("此操作将完成加工, 是否继续?", "提示", {
type: "warning",
})
.then(() => {
status = '4',
request({
url: `/api/scm/WorkOrder/closestatus/${id}/${status}`,
method: "Post",
}).then((res) => {
this.$message({
type: "success",
message: res.msg,
onClose: () => {
this.initData();
},
});
});
})
.catch(() => { });
},
addOstartsRescind(id, status) {
this.$confirm("此操作将进行取消加工, 是否继续?", "提示", {
type: "warning",
})
.then(() => {
status = '5',
request({
url: `/api/scm/WorkOrder/closestatus/${id}/${status}`,
method: "Post",
}).then((res) => {
this.$message({
type: "success",
message: res.msg,
onClose: () => {
this.initData();
},
});
});
})
.catch(() => { });
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {

Write Preview
Loading…
Cancel
Save