From 2d3acff426ed3a6327269d0e6d5f5ba763f7c59c Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Mon, 22 Jul 2024 17:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/scm/WarehousingOutboundMapper.xml  |   70 +-
 .../mapper/WarehousingOutboundMapper.java     |    2 -
 .../service/WarehousingOutboundService.java   |    3 -
 .../service/impl/CwsettlementServiceImpl.java |   44 +
 .../impl/WarehousingOutboundServiceImpl.java  |    6 +-
 .../impl/WarehousingStorageServiceImpl.java   |    8 +-
 .../controller/BusinessOrderController.java   |   13 -
 .../controller/CwsettlementController.java    |   21 -
 .../jnpf/controller/WorkOrderController.java  |   13 +-
 .../src/views/extend/cwsettlement/index.vue   |    2 +-
 .../purchaseCenter/purchaseOrder/index.vue    |    4 +-
 .../scm/purchaseCenter/receiptOrder/form.vue  |   12 +-
 .../scm/saleCenter/deliveryOrder/form.vue     | 1555 ++++++++++-------
 .../views/scm/saleCenter/saleOrder/index.vue  |    4 +-
 .../warehousing/warehousingoutbound/index.vue |    2 +-
 .../warehousing/warehousingstorage/index.vue  |    2 +-
 .../src/views/scm/workorder/index.vue         |    8 +-
 17 files changed, 1023 insertions(+), 746 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
index 2ea02aa2..472e0b0e 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
@@ -156,78 +156,14 @@
             '' as ESB_MESSAGE,
             IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE,
             aa.batch_number as BATCH_ID,
-            concat(ab.code,'-',LPAD(ab.ord_ln,3,0)) as PUR_ORDER
-        FROM
-            jg_warehousing_outbound a
-                RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null
---                 LEFT JOIN jg_warehousing_storage_product ab ON aa.batch_number = ab.batch_number AND ab.f_delete_mark is null
---                 LEFT JOIN jg_warehousing_storage ac ON ab.warehousing_storage_id = ac.id AND ac.f_delete_mark is null
-                LEFT JOIN jg_business_batch ab ON aa.batch_number = ab.batch_number AND ab.f_delete_mark is null
-
-                LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL
-                LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL
-                LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND d.f_delete_mark IS NULL
-                LEFT JOIN base_organize e ON a.company_id = e.f_id AND e.f_delete_mark IS NULL
-                LEFT JOIN base_organize f ON a.department_id = f.f_id AND f.f_delete_mark IS NULL
-                LEFT JOIN base_user g ON a.f_creator_user_id = g.f_id AND g.f_delete_mark IS NULL
-                LEFT JOIN jg_contract h ON c.contract_id = h.id AND h.f_delete_mark IS NULL
-                LEFT JOIN jg_business_cargo i ON aa.outbound_area_id = i.id AND i.f_delete_mark IS NULL
-                LEFT JOIN jg_product j ON aa.product_id = j.id AND j.f_delete_mark is null
-                LEFT JOIN base_user k ON a.f_last_modify_user_id = k.f_id AND k.f_delete_mark IS NULL
-                LEFT JOIN jg_delivery_order l on a.warehousing_id = l.id and l.f_delete_mark is null
-                LEFT JOIN jg_business_order m on l.business_id = m.id and m.f_delete_mark is null
-                LEFT JOIN jg_business_order_product_relational n on c.id = n.business_order_id and n.f_delete_mark is null and  aa.product_id = n.product_id and aa.outbound_unit = n.sales_main_unit_id and aa.ord_ln = n.ord_ln
-                LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and  aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id and aa.ord_ln = o.ord_ln
-                LEFT JOIN jg_contract p ON m.contract_id = p.id AND p.f_delete_mark IS NULL
-                LEFT JOIN jg_subject_basic q ON m.first_subject_basic_id = q.id AND q.f_delete_mark IS NULL
-                LEFT JOIN jg_business_order r ON a.business_order_no = r.code AND r.f_delete_mark is null
-                LEFT JOIN jg_contract s ON r.contract_id = s.id AND s.f_delete_mark is null
-        WHERE
-            a.f_delete_mark is null
-          AND a.id = #{id}
-    </select>
-
-
-    <select id="saleOutBoundByYunGuan2" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
-        SELECT
-            a.id AS OUT_ID,
-            e.f_en_code AS COMP_ID,
-            f.f_en_code AS DEPT_ID,
-            a.document_no AS PROD_ZL,
-            aa.order_line as CK_ORDER,
-            IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
-            IF(a.warehousing_outbound_type = 1,d.code,q.code) as CUS_ID,
-            IF(a.warehousing_outbound_type = 1,d.name,q.name) as CUS_NAME,
-            i.cargo_name AS STORE_ID,
-            a.warehousing_time as OUT_DTM,
-            a.remark as REMARKS,
-            j.CODE AS MAT_ID,
-            j.NAME AS MAT_NAME,
-            aa.spec AS SPECIFICATION,
-            aa.outbound_unit AS UNIT,
-            aa.outbound_number AS OUT_QUANTITY,
-            '2' as OUT_FLAG,
-            s.contract_no as contract_no,
-            g.f_real_name as CREATE_EMP_ID,
-            a.f_creator_time as CREATE_DTM,
-            k.f_real_name as MODIFY_EMP_ID,
-            a.f_last_modify_time as MODIFY_DTM,
-            '0' as CANCLE_YN,
-            '1' as OUT_TYPE,
-            'N' as READ_FLAG,
-            null as READ_TIME,
-            '' as ERR_MESSAGE,
-            'N' as ESB_STATUS,
-            null as ESB_DTM,
-            '' as ESB_MESSAGE,
-            IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE,
-            aa.batch_number as BATCH_ID,
-            concat(ac.business_order_no,'-',LPAD(ab.ord_ln,3,0)) as PUR_ORDER
+            IF(ad.code,concat(ad.code,'-',LPAD(ad.ord_ln,3,0)),concat(ac.business_order_no,'-',LPAD(ab.ord_ln,3,0))) as PUR_ORDER
         FROM
             jg_warehousing_outbound a
                 RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null
                 LEFT JOIN jg_warehousing_storage_product ab ON aa.batch_number = ab.batch_number AND ab.f_delete_mark is null
                 LEFT JOIN jg_warehousing_storage ac ON ab.warehousing_storage_id = ac.id AND ac.f_delete_mark is null
+                LEFT JOIN jg_business_batch ad ON aa.batch_number = ad.batch_number AND ad.f_delete_mark is null
+
                 LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL
                 LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL
                 LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND d.f_delete_mark IS NULL
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java
index 9cfe8e28..bda5a199 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundMapper.java
@@ -36,8 +36,6 @@ public interface WarehousingOutboundMapper extends BaseMapper<WarehousingOutboun
 
     //运管销售出库
     List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(@Param("id") String id);
-    //运管销售出库第二选择
-    List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan2(@Param("id") String id);
 ////    运管销售出库商品
 //    List<YunguanSaleOutBoundModel> saleOutBoundProductByYunGuan(@Param("id") String id);
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java
index d2d20ba5..f245e179 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java
@@ -67,7 +67,4 @@ public interface WarehousingOutboundService extends IService<WarehousingOutbound
 
     //运管销售出库
     List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(String id);
-
-    //运管销售出库第二选择
-    List<YunguanSaleOutBoundModel> saleOutBoundByYunGua2(String id);
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
index 19c002f0..1e761db9 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
@@ -1091,8 +1091,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
         if (ObjectUtil.isNotEmpty(purchaseCode)){
             if (purchaseCode.get("code").equals("200")) {
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
                 return true;
+            }else{
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
             }
+        }else{
+            cwsettlementEntity.setErpMark("N");
+            cwsettlementEntity.setErpMassage("ESB返回为空");
+            cwsettlementMapper.updateById(cwsettlementEntity);
         }
         return false;
     }
@@ -1167,8 +1178,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
         if (ObjectUtil.isNotEmpty(purchaseCode)){
             if (purchaseCode.get("code").equals("200")) {
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
                 return true;
+            }else{
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
             }
+        }else{
+            cwsettlementEntity.setErpMark("N");
+            cwsettlementEntity.setErpMassage("ESB返回为空");
+            cwsettlementMapper.updateById(cwsettlementEntity);
         }
         return false;
     }
@@ -1255,8 +1277,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
         if (ObjectUtil.isNotEmpty(purchaseCode)){
             if (purchaseCode.get("code").equals("200")) {
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
                 return true;
+            }else{
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
             }
+        }else{
+            cwsettlementEntity.setErpMark("N");
+            cwsettlementEntity.setErpMassage("ESB返回为空");
+            cwsettlementMapper.updateById(cwsettlementEntity);
         }
         return false;
     }
@@ -1332,8 +1365,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
         if (ObjectUtil.isNotEmpty(purchaseCode)){
             if (purchaseCode.get("code").equals("200")) {
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
                 return true;
+            }else{
+                cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
+                cwsettlementEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+                cwsettlementMapper.updateById(cwsettlementEntity);
             }
+        }else{
+            cwsettlementEntity.setErpMark("N");
+            cwsettlementEntity.setErpMassage("ESB返回为空");
+            cwsettlementMapper.updateById(cwsettlementEntity);
         }
         return false;
     }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
index 05a6d38c..578c6d33 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
@@ -922,6 +922,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                     entity.setErpMark("N");
                     entity.setErpMassage("ESB返回为空");
                 }
+                this.saveOrUpdate(entity);
             }
         }
     }
@@ -945,9 +946,4 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
     public List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(String id) {
         return warehousingOutboundMapper.saleOutBoundByYunGuan(id);
     }
-
-    @Override
-    public List<YunguanSaleOutBoundModel> saleOutBoundByYunGua2(String id) {
-        return warehousingOutboundMapper.saleOutBoundByYunGuan2(id);
-    }
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
index c4e31ab4..d836582d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
@@ -968,17 +968,15 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
             if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
                 JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
                 if (ObjectUtil.isNotEmpty(purchaseCode)){
-                    if (purchaseCode.get("code").equals("200")) {
-                        entity.setErpMark(purchaseCode.get("code").toString());
-                        entity.setErpMassage(purchaseCode.get("errmsg").toString());
-                    }
+                    entity.setErpMark(purchaseCode.get("code").toString());
+                    entity.setErpMassage(purchaseCode.get("errmsg").toString());
                 }else{
                     entity.setErpMark("N");
                     entity.setErpMassage("ESB返回为空");
                 }
+                this.saveOrUpdate(entity);
             }
         }
-        this.saveOrUpdate(entity);
     }
 
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
index 6350587f..d7fecf71 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
@@ -1619,19 +1619,6 @@ public class BusinessOrderController {
                     return ActionResult.fail("推送失败");
                 }
             }
-            //销售出库接口第二选择
-            else{
-                List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList2 = warehousingOutboundService.saleOutBoundByYunGua2(id);
-                if (yunguanSaleOutBoundModelList2 != null && yunguanSaleOutBoundModelList2.size()>0) {
-                    JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList2));
-                    if (ObjectUtil.isNotEmpty(saleCode) && saleCode.get("code").equals("200")){
-                        return ActionResult.success("推送成功");
-                    }else {
-                        return ActionResult.fail("推送失败");
-                    }
-                }
-            }
-
         } else if (type.equals("5")) {  //生产加工接口
             List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
             List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
index 28351ddc..1eb5aab5 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
@@ -664,35 +664,14 @@ public class CwsettlementController {
                             boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity);
                             if(headFlag){
                                 boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity);
-                                if (lineFlag){
-//                                    entity.setErpMark(saleCode.get("code").toString());
-//                                    entity.setErpMassage(saleCode.get("errmsg").toString());
-                                }else {
-                                    entity.setErpMark("N");
-                                    entity.setErpMassage("ESB返回为空");
-                                }
-                            }else {
-                                entity.setErpMark("N");
-                                entity.setErpMassage("ESB返回为空");
                             }
                         }else{
                             //采购
                             boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity);
                             if(headFlag){
                                 boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity);
-                                if (lineFlag){
-//                                    entity.setErpMark(saleCode.get("code").toString());
-//                                    entity.setErpMassage(saleCode.get("errmsg").toString());
-                                }else {
-                                    entity.setErpMark("N");
-                                    entity.setErpMassage("ESB返回为空");
-                                }
-                            } else {
-                                entity.setErpMark("N");
-                                entity.setErpMassage("ESB返回为空");
                             }
                         }
-                        cwsettlementService.saveOrUpdate(cwsettlementForm,id,false);
                     }
                 }
             }catch(Exception e){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
index bc40435b..ee6a7bd5 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
@@ -801,20 +801,13 @@ public class WorkOrderController {
                         yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
                         JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
                         if(ObjectUtil.isNotEmpty(workOrderCode)){
-                            if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
-                                entity.setErpMark(workOrderCode.get("code").toString());
-                                entity.setErpMassage(workOrderCode.get("errmsg").toString());
-                            }else {
-                                entity.setErpMark("N");
-                                entity.setErpMassage("ESB返回为空");
-                            }
+                            entity.setErpMark(workOrderCode.get("code").toString());
+                            entity.setErpMassage(workOrderCode.get("errmsg").toString());
                         }else {
                             entity.setErpMark("N");
                             entity.setErpMassage("ESB返回为空");
                         }
-
-                        workOrderService.saveOrUpdate(workOrderForm,id,false);
-
+                        workOrderService.updateById(entity);
                     }
                 }
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
index 750213ad..24a9ca70 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
@@ -204,7 +204,7 @@
               <el-button size="mini" type="text"
                 v-if="scope.row.settlableAmount > 0 && scope.row.flowState==2"
                 @click="shoufukuanHandle(scope.row)">收付款</el-button>
-              <!-- <template v-if="scope.row.flowState == 2 && scope.row.yunguanMark !== 'Y'">
+              <!-- <template v-if="scope.row.flowState == 2 && scope.row.erpMark != '200'">
                 <el-button size="mini" type="text" @click="repush(scope.row)">重新推送</el-button>
               </template> -->
             </template>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
index f302e8c3..8be3f8de 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
@@ -261,7 +261,7 @@
                 @click="handleDelVoucher(scope.row.id)">删除
               </el-button>
 
-              <!-- <template v-if="scope.row.flowState == '2' && scope.row.yunguanMark !== 'Y'">
+              <!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
                 <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
               </template> -->
             </template>
@@ -522,7 +522,7 @@ export default {
       })
     },
     inBoundNotice(row) {
-      // if (row.yunguanMark !== 'Y') {
+      // if (row.erpMark != '200') {
       //   this.$message({
       //     type: 'error',
       //     message: '运管暂未返回正常订单状态',
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
index 9bfddb53..b41a1eb8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
@@ -1789,7 +1789,7 @@ export default {
       );
     },
     getPurchaseOrder(val, val2) {
-      // if (val2.yunguanMark != 'Y') {
+      // if (val2.erpMark != '200') {
       //   this.dataForm.businessId = undefined
       //   this.$message({
       //     message: '运管暂未返回正常订单状态',
@@ -1809,11 +1809,11 @@ export default {
       val2.businessOrderProductRelationalList.forEach((item, index) => {
         this.productIdList.push(item.productId);
         item.orderNo = item.ordLn;
-        item.productName = item.name
-        item.saleNum = item.businessNum
-        item.deliveryUnit = item.salesMainUnitId
-        item.returnUnit = item.businessPrice
-        item.businessType = "1"
+        item.productName = item.name;
+        item.saleNum = item.businessNum;
+        item.deliveryUnit = item.salesMainUnitId;
+        item.returnUnit = item.businessPrice;
+        item.businessType = "1";
       });
       this.dataForm.deliveryProductRelationList = val2.businessOrderProductRelationalList;
       this.productByOrderList = val2.businessOrderProductRelationalList;
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
index b6442405..bdb84337 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="judgeShow('deliveryCode')">
             <jnpf-form-tip-item label="订单编号" v-if="judgeShow('deliveryCode')" prop="deliveryCode">
               <JnpfInput v-model="dataForm.deliveryCode" @change="changeData('deliveryCode', -1)"
-                placeholder="系统自动生成" :disabled="true" readonly :style='{ "width": "100%" }'>
+                placeholder="系统自动生成" :disabled="true" readonly :style="{ width: '100%' }">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -37,7 +37,7 @@
               prop="preparationTime">
               <JnpfOpenData v-model="dataForm.preparationTime"
                 @change="changeData('preparationTime', -1)" placeholder="系统自动生成"
-                :disabled="judgeWrite('preparationTime')" readonly :style='{ "width": "100%" }'
+                :disabled="judgeWrite('preparationTime')" readonly :style="{ width: '100%' }"
                 type="currTime">
               </JnpfOpenData>
             </jnpf-form-tip-item>
@@ -53,10 +53,10 @@
               <JnpfPopupSelect v-model="dataForm.businessId" @change="getSaleOrder" :rowIndex="null"
                 :formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
                 :disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='code' field='businessId'
+                popupTitle="选择数据" popupType="dialog" relationField="code" field="businessId"
                 interfaceId="529638640356183877" :pageSize="20" :hasPage="true"
                 :innerName="dataForm.businessOrderCode" :columnOptions="businessIdcolumnOptions"
-                clearable :style='{ "width": "100%" }'>
+                clearable :style="{ width: '100%' }">
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -67,9 +67,9 @@
                 @change="changeData('reservedFields1', -1)" :rowIndex="null" :formData="dataForm"
                 :templateJson="interfaceRes.reservedFields1" placeholder="请选择" :disabled="true"
                 propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                relationField='name' field='reservedFields1' interfaceId="517979330417001669"
+                relationField="name" field="reservedFields1" interfaceId="517979330417001669"
                 :pageSize="20" :columnOptions="reservedFields1columnOptions" clearable
-                :style='{ "width": "100%" }'>
+                :style="{ width: '100%' }">
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -78,7 +78,7 @@
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.businessOrderInfoList" size='mini'>
+              <el-table :data="dataForm.businessOrderInfoList" size="mini">
                 <el-table-column type="index" width="50" label="序号" align="center" />
                 <el-table-column label="销售订单" v-if="judgeShow('warehousingproduct-productName')"
                   prop="code">
@@ -87,24 +87,31 @@
                       v-if="judgeRequired('warehousingproductList-productName')">*</span>销售订单
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.code"
-                      @change="changeData('warehousingproduct-productName', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-productName')"
-                      clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.code" @change="
+                      changeData(
+                        'warehousingproduct-productName',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="judgeWrite('warehousingproductList') ||
+                        judgeWrite('warehousingproductList-productName')
+                        " clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="订单类型"
                   v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>订单类型
+                    <span class="required-sign" v-if="
+                      judgeRequired('warehousingproductList-inventoryUnitId')
+                    ">*</span>订单类型
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.orderType"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                    <JnpfSelect v-model="scope.row.orderType" @change="
+                      changeData(
+                        'warehousingproductList-inventoryUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
                       :options="orderTypeOptions" :props="orderTypeProps">
                     </JnpfSelect>
                   </template>
@@ -127,15 +134,19 @@
                 <el-table-column label="关联客户(二级)"
                   v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联客户(二级)
+                    <span class="required-sign" v-if="
+                      judgeRequired('warehousingproductList-purchaseUnitId')
+                    ">*</span>关联客户(二级)
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.secondCustomName"
-                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-purchaseUnitId')"
-                      clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.secondCustomName" @change="
+                      changeData(
+                        'warehousingproduct-purchaseUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="judgeWrite('warehousingproductList') ||
+                        judgeWrite('warehousingproductList-purchaseUnitId')
+                        " clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -146,24 +157,31 @@
                       v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.businessLineName"
-                      @change="changeData('warehousingproduct-purchaseNum', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-purchaseNum')"
-                      clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.businessLineName" @change="
+                      changeData(
+                        'warehousingproduct-purchaseNum',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="judgeWrite('warehousingproductList') ||
+                        judgeWrite('warehousingproductList-purchaseNum')
+                        " clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="业务类型"
                   v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>业务类型
+                    <span class="required-sign" v-if="
+                      judgeRequired('warehousingproductList-inventoryUnitId')
+                    ">*</span>业务类型
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.businessOrderType"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                    <JnpfSelect v-model="scope.row.businessOrderType" @change="
+                      changeData(
+                        'warehousingproductList-inventoryUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
                       :options="businessOrderTypeOptions" :props="businessOrderTypeProps">
                     </JnpfSelect>
                   </template>
@@ -171,13 +189,17 @@
                 <el-table-column label="币种"
                   v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>币种
+                    <span class="required-sign" v-if="
+                      judgeRequired('warehousingproductList-inventoryUnitId')
+                    ">*</span>币种
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.currency"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                    <JnpfSelect v-model="scope.row.currency" @change="
+                      changeData(
+                        'warehousingproductList-inventoryUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
                       :options="currencyOptions" :props="currencyProps">
                     </JnpfSelect>
                   </template>
@@ -185,13 +207,17 @@
                 <el-table-column label="销售模式"
                   v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>销售模式
+                    <span class="required-sign" v-if="
+                      judgeRequired('warehousingproductList-inventoryUnitId')
+                    ">*</span>销售模式
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.saleMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                    <JnpfSelect v-model="scope.row.saleMode" @change="
+                      changeData(
+                        'warehousingproductList-inventoryUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
                       :options="saleModeOptions" :props="saleModeProps">
                     </JnpfSelect>
                   </template>
@@ -199,13 +225,17 @@
                 <el-table-column label="交货方式"
                   v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>交货方式
+                    <span class="required-sign" v-if="
+                      judgeRequired('warehousingproductList-inventoryUnitId')
+                    ">*</span>交货方式
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.transactionMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                    <JnpfSelect v-model="scope.row.transactionMode" @change="
+                      changeData(
+                        'warehousingproductList-inventoryUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
                       :options="transactionModeOptions" :props="transactionModeProps">
                     </JnpfSelect>
                   </template>
@@ -213,13 +243,17 @@
                 <el-table-column label="运输方式"
                   v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>运输方式
+                    <span class="required-sign" v-if="
+                      judgeRequired('warehousingproductList-inventoryUnitId')
+                    ">*</span>运输方式
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.transportMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                    <JnpfSelect v-model="scope.row.transportMode" @change="
+                      changeData(
+                        'warehousingproductList-inventoryUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
                       :options="transportModeOptions" :props="transportModeProps">
                     </JnpfSelect>
                   </template>
@@ -238,9 +272,9 @@
               <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectId"
                 placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectId'
+                popupTitle="选择数据" popupType="dialog" relationField="name" field="subjectId"
                 interfaceId="522693551289534725" :pageSize="20" :hasPage="true"
-                :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :columnOptions="subjectIdcolumnOptions" clearable :style="{ width: '100%' }">
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -249,7 +283,7 @@
               prop="deliveryAddress">
               <JnpfInput v-model="dataForm.deliveryAddress"
                 @change="changeData('deliveryAddress', -1)" placeholder="请输入" :disabled="true"
-                clearable :style='{ "width": "100%" }'>
+                clearable :style="{ width: '100%' }">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -265,9 +299,9 @@
                 @change="changeData('enterpriseId', -1)" :rowIndex="null" :formData="dataForm"
                 :templateJson="interfaceRes.enterpriseId" placeholder="请选择" :disabled="true"
                 propsValue="f_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
+                relationField="f_full_name" field="enterpriseId" interfaceId="522729853024209157"
                 :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable
-                :style='{ "width": "100%" }'>
+                :style="{ width: '100%' }">
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -277,9 +311,9 @@
                 @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
                 :templateJson="interfaceRes.warehouseId" placeholder="请选择" :disabled="true"
                 propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                relationField='name' field='warehouseId' interfaceId="522701377537837317"
+                relationField="name" field="warehouseId" interfaceId="522701377537837317"
                 :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable
-                :style='{ "width": "100%" }'>
+                :style="{ width: '100%' }">
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -290,10 +324,9 @@
                 @change="changeData('shippingAddress', -1)" :rowIndex="null" :formData="dataForm"
                 :templateJson="interfaceRes.shippingAddress" placeholder="请选择" :disabled="true"
                 propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                relationField='addressDetail' field='shippingAddress'
+                relationField="addressDetail" field="shippingAddress"
                 interfaceId="522724961224231173" :pageSize="20"
-                :columnOptions="shippingAddresscolumnOptions" clearable
-                :style='{ "width": "100%" }'>
+                :columnOptions="shippingAddresscolumnOptions" clearable :style="{ width: '100%' }">
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -306,8 +339,8 @@
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
               <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)"
-                placeholder="请输入" :disabled="judgeWrite('remark')" :style='{ "width": "100%" }' true
-                type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
+                placeholder="请输入" :disabled="judgeWrite('remark')" :style="{ width: '100%' }" true
+                type="textarea" :autosize="{ minRows: 4, maxRows: 4 }">
               </JnpfTextarea>
             </jnpf-form-tip-item>
           </el-col>
@@ -570,14 +603,15 @@
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.deliveryProductRelationList" size='mini' show-summary
+              <el-table :data="dataForm.deliveryProductRelationList" size="mini" show-summary
                 :summary-method="getSummaries">
                 <el-table-column type="index" width="50" label="序号" align="center" />
                 <el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')"
                   prop="productId" width="250">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-productId')">*</span>商品名称
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-productId')
+                    ">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
                     <!-- <JnpfPopupSelect v-model="scope.row.productId"
@@ -591,9 +625,8 @@
                       clearable :style='{ "width": "100%" }'>
                     </JnpfPopupSelect> -->
                     <JnpfInput v-model="scope.row.productName" @change="
-                        changeData('deliveryproductrelation-spec', scope.$index)
-                      " placeholder="请输入" :disabled="true
-                      " clearable :style="{ width: '100%' }">
+                      changeData('deliveryproductrelation-spec', scope.$index)
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -604,9 +637,9 @@
                       v-if="judgeRequired('deliveryproductrelationList-spec')">*</span>规格
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('deliveryproductrelation-spec', scope.$index)"
-                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.spec" @change="
+                      changeData('deliveryproductrelation-spec', scope.$index)
+                      " placeholder="请输入" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -614,13 +647,19 @@
                   v-if="judgeShow('deliveryproductrelation-inventoryUnitId')" prop="inventoryUnitId"
                   width="100">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-inventoryUnitId')">*</span>库存单位
+                    <span class="required-sign" v-if="
+                      judgeRequired(
+                        'deliveryproductrelationList-inventoryUnitId'
+                      )
+                    ">*</span>库存单位
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryUnitId"
-                      @change="changeData('deliveryproductrelation-inventoryUnitId', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.inventoryUnitId" @change="
+                      changeData(
+                        'deliveryproductrelation-inventoryUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -628,26 +667,36 @@
                   v-if="judgeShow('deliveryproductrelation-salesMainUnitId')" prop="salesMainUnitId"
                   width="100">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-salesMainUnitId')">*</span>销售单位
+                    <span class="required-sign" v-if="
+                      judgeRequired(
+                        'deliveryproductrelationList-salesMainUnitId'
+                      )
+                    ">*</span>销售单位
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.salesMainUnitId"
-                      @change="changeData('deliveryproductrelation-salesMainUnitId', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.salesMainUnitId" @change="
+                      changeData(
+                        'deliveryproductrelation-salesMainUnitId',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="销售数量" v-if="judgeShow('deliveryproductrelation-saleNum')"
                   prop="saleNum" width="150">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-saleNum')">*</span>销售数量
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-saleNum')
+                    ">*</span>销售数量
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.saleNum"
-                      @change="changeData('deliveryproductrelation-saleNum', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.saleNum" @change="
+                      changeData(
+                        'deliveryproductrelation-saleNum',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -655,13 +704,19 @@
                   v-if="judgeShow('deliveryproductrelation-deliveryUnit')" prop="deliveryUnit"
                   width="100">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-deliveryUnit')">*</span>发货单位
+                    <span class="required-sign" v-if="
+                      judgeRequired(
+                        'deliveryproductrelationList-deliveryUnit'
+                      )
+                    ">*</span>发货单位
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.deliveryUnit"
-                      @change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                    <JnpfSelect v-model="scope.row.deliveryUnit" @change="
+                      changeData(
+                        'deliveryproductrelation-deliveryUnit',
+                        scope.$index
+                      )
+                      " placeholder="请选择" :disabled="true" clearable :style="{ width: '100%' }"
                       :options="deliveryproductrelationdeliveryUnitOptions"
                       :props="deliveryproductrelationdeliveryUnitProps">
                     </JnpfSelect>
@@ -735,20 +790,20 @@
                 <el-table-column label="货区名称" v-if="judgeShow('deliveryproductrelation-cargoId')"
                   prop="cargoId" width="200">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-cargoId')">*</span>货区名称
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-cargoId')
+                    ">*</span>货区名称
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelectInnerName v-model="scope.row.cargoId" @change="batchNoMethod"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-cargoId')"
-                      propsValue="cargoId" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='cargoName' :field="'cargoId' + scope.$index"
+                      :rowIndex="scope.$index" :formData="dataForm" :templateJson="interfaceRes.deliveryproductrelationcargoId
+                        " placeholder="请选择" :disabled="judgeWrite('deliveryproductrelationList') ||
+                        judgeWrite('deliveryproductrelationList-cargoId')
+                        " propsValue="cargoId" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField="cargoName" :field="'cargoId' + scope.$index"
                       interfaceId="549927783325776837" :pageSize="20"
-                      :innerName="scope.row.cargoName"
-                      :columnOptions="deliveryproductrelationcargoIdcolumnOptions" clearable
-                      :style='{ "width": "100%" }'>
+                      :innerName="scope.row.cargoName" :columnOptions="deliveryproductrelationcargoIdcolumnOptions
+                        " clearable :style="{ width: '100%' }">
                     </JnpfPopupSelectInnerName>
                   </template>
                 </el-table-column>
@@ -756,28 +811,36 @@
                   v-if="judgeShow('deliveryproductrelation-deliveryNum')" prop="deliveryNum"
                   width="150">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-deliveryNum')">*</span>发货数量
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-deliveryNum')
+                    ">*</span>发货数量
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.deliveryNum"
-                      @change="changeData('deliveryproductrelation-deliveryNum', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryNum')"
-                      clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.deliveryNum" @change="
+                      changeData(
+                        'deliveryproductrelation-deliveryNum',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="judgeWrite('deliveryproductrelationList') ||
+                        judgeWrite('deliveryproductrelationList-deliveryNum')
+                        " clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="批次号" v-if="judgeShow('deliveryproductrelation-batchNo')"
                   prop="batchNo" width="200">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-batchNo')">*</span>批次号
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-batchNo')
+                    ">*</span>批次号
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.batchNo"
-                      @change="changeData('deliveryproductrelation-batchNo', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.batchNo" @change="
+                      changeData(
+                        'deliveryproductrelation-batchNo',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -786,13 +849,17 @@
                   v-if="judgeShow('deliveryproductrelation-inventoryNo')" prop="inventoryNo"
                   width="200">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-inventoryNo')">*</span>库存数量
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-inventoryNo')
+                    ">*</span>库存数量
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryNo"
-                      @change="changeData('deliveryproductrelation-inventoryNo', scope.$index)"
-                      placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.inventoryNo" @change="
+                      changeData(
+                        'deliveryproductrelation-inventoryNo',
+                        scope.$index
+                      )
+                      " placeholder="请输入" disabled clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -805,26 +872,30 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.produceDate" @change="
-                        changeData(
-                          'warehousingproduct-produceDate',
-                          scope.$index
-                        )
+                      changeData(
+                        'warehousingproduct-produceDate',
+                        scope.$index
+                      )
                       " :startTime="dateTime(false, 1, 1, '', '')"
-                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="true
-                      " clearable :style="{ width: '100%' }" type="date" format="yyyy-MM-dd">
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="true"
+                      clearable :style="{ width: '100%' }" type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
                 <el-table-column label="发货单价" v-if="judgeShow('deliveryproductrelation-returnUnit')"
                   prop="returnUnit" width="150">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-returnUnit')">*</span>发货单价
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-returnUnit')
+                    ">*</span>发货单价
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.returnUnit"
-                      @change="changeData('deliveryproductrelation-returnUnit', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.returnUnit" @change="
+                      changeData(
+                        'deliveryproductrelation-returnUnit',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -835,22 +906,26 @@
                       v-if="judgeRequired('deliveryproductrelationList-tax')">*</span>税率
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.tax"
-                      @change="changeData('deliveryproductrelation-tax', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.tax" @change="
+                      changeData('deliveryproductrelation-tax', scope.$index)
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="含税小计" v-if="judgeShow('deliveryproductrelation-taxCount')"
                   prop="taxCount" width="150">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-taxCount')">*</span>含税小计
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-taxCount')
+                    ">*</span>含税小计
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.taxCount"
-                      @change="changeData('deliveryproductrelation-taxCount', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.taxCount" @change="
+                      changeData(
+                        'deliveryproductrelation-taxCount',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -858,13 +933,17 @@
                   v-if="judgeShow('deliveryproductrelation-notTaxPrice')" prop="notTaxPrice"
                   width="150">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-notTaxPrice')">*</span>不含税单价
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-notTaxPrice')
+                    ">*</span>不含税单价
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.notTaxPrice"
-                      @change="changeData('deliveryproductrelation-notTaxPrice', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.notTaxPrice" @change="
+                      changeData(
+                        'deliveryproductrelation-notTaxPrice',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -872,13 +951,17 @@
                   v-if="judgeShow('deliveryproductrelation-notTaxCount')" prop="notTaxCount"
                   width="150">
                   <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('deliveryproductrelationList-notTaxCount')">*</span>不含税小计
+                    <span class="required-sign" v-if="
+                      judgeRequired('deliveryproductrelationList-notTaxCount')
+                    ">*</span>不含税小计
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.notTaxCount"
-                      @change="changeData('deliveryproductrelation-notTaxCount', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.notTaxCount" @change="
+                      changeData(
+                        'deliveryproductrelation-notTaxCount',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -889,11 +972,14 @@
                       v-if="judgeRequired('deliveryproductrelationList-remark')">*</span>备注
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.remark"
-                      @change="changeData('deliveryproductrelation-remark', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-remark')"
-                      clearable :style='{ "width": "100%" }'>
+                    <JnpfInput v-model="scope.row.remark" @change="
+                      changeData(
+                        'deliveryproductrelation-remark',
+                        scope.$index
+                      )
+                      " placeholder="请输入" :disabled="judgeWrite('deliveryproductrelationList') ||
+                        judgeWrite('deliveryproductrelationList-remark')
+                        " clearable :style="{ width: '100%' }">
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -926,18 +1012,24 @@
 </template>
 
 <script>
-import request from '@/utils/request'
+import request from "@/utils/request";
 import { mapGetters } from "vuex";
-import { getFormById } from '@/api/workFlow/FormDesign'
-import comMixin from '@/views/workFlow/workFlowForm/mixin';
-import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-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 AllProductBox from '@/views/scm/publicPopup/AllProductBox'
-import VoucherBox from '@/views/scm/publicPopup/VoucherBox'
+import { getFormById } from "@/api/workFlow/FormDesign";
+import comMixin from "@/views/workFlow/workFlowForm/mixin";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import { getDefaultCurrentValueUserId } from "@/api/permission/user";
+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 AllProductBox from "@/views/scm/publicPopup/AllProductBox";
+import VoucherBox from "@/views/scm/publicPopup/VoucherBox";
 export default {
   mixins: [comMixin],
   components: { AllProductBox, VoucherBox },
@@ -958,93 +1050,114 @@ export default {
       visible: false,
       loading: false,
       btnLoading: false,
-      formRef: 'formRef',
+      formRef: "formRef",
       setting: {},
-      eventType: '',
+      eventType: "",
       userBoxVisible: false,
       selectDialogVisible: false,
       currTableConf: {},
       dataValueAll: {},
       addTableConf: {
-        deliveryVoucherRelationList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
-        deliveryProductRelationList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+        deliveryVoucherRelationList: {
+          popupType: "dialog",
+          hasPage: true,
+          popupTitle: "选择数据",
+          pageSize: 20,
+          columnOptions: [],
+          interfaceId: "",
+          interfaceName: "",
+          relationOptions: [],
+          templateJson: [],
+          popupWidth: "800px"
+        },
+        deliveryProductRelationList: {
+          popupType: "dialog",
+          hasPage: true,
+          popupTitle: "选择数据",
+          pageSize: 20,
+          columnOptions: [],
+          interfaceId: "",
+          interfaceName: "",
+          relationOptions: [],
+          templateJson: [],
+          popupWidth: "800px"
+        }
       },
       //可选范围默认值
-      ableAll: {
-      },
+      ableAll: {},
       tableRows: {
         deliveryVoucherRelationList: {
-          voucherId: '',
+          voucherId: "",
           voucherIdOptions: [],
           documentTypeOptions: [],
           voucherTypeOptions: [],
-          poundCode: '',
+          poundCode: "",
           poundCodeOptions: [],
-          poundlistTime: '',
+          poundlistTime: "",
           poundlistTimeOptions: [],
-          vehicleId: '',
+          vehicleId: "",
           vehicleNameOptions: [],
-          productId: '',
+          productId: "",
           productIdOptions: [],
-          spec: '',
+          spec: "",
           specOptions: [],
-          unit: '',
+          unit: "",
           unitOptions: [],
-          grossWeight: '',
+          grossWeight: "",
           grossWeightOptions: [],
-          tareWeight: '',
+          tareWeight: "",
           tareWeightOptions: [],
-          buckleWeight: '',
+          buckleWeight: "",
           buckleWeightOptions: [],
-          netWeight: '',
+          netWeight: "",
           netWeightOptions: [],
-          remark: '',
+          remark: "",
           remarkOptions: [],
           enabledmark: undefined
         },
         deliveryproductrelationList: {
-          productId: '',
+          productId: "",
           productIdOptions: [],
-          spec: '',
+          spec: "",
           specOptions: [],
-          inventoryUnitId: '',
+          inventoryUnitId: "",
           inventoryUnitIdOptions: [],
-          salesMainUnitId: '',
+          salesMainUnitId: "",
           salesMainUnitIdOptions: [],
-          saleNum: '',
+          saleNum: "",
           saleNumOptions: [],
           deliveryUnitOptions: [],
-          grossWeight: '',
+          grossWeight: "",
           grossWeightOptions: [],
-          tareWeight: '',
+          tareWeight: "",
           tareWeightOptions: [],
-          buckleWeight: '',
+          buckleWeight: "",
           buckleWeightOptions: [],
-          netWeight: '',
+          netWeight: "",
           netWeightOptions: [],
-          cargoId: '',
+          cargoId: "",
           cargoIdOptions: [],
-          deliveryNum: '',
+          deliveryNum: "",
           deliveryNumOptions: [],
-          batchNo: '',
-          inventoryNo: '',
+          batchNo: "",
+          inventoryNo: "",
           batchNoOptions: [],
-          produceTime: '',
+          produceTime: "",
           produceTimeOptions: [],
-          returnUnit: '',
+          returnUnit: "",
           returnUnitOptions: [],
-          tax: '',
+          tax: "",
           taxOptions: [],
-          taxCount: '',
+          taxCount: "",
           taxCountOptions: [],
-          notTaxPrice: '',
+          notTaxPrice: "",
           notTaxPriceOptions: [],
-          notTaxCount: '',
+          notTaxCount: "",
           notTaxCountOptions: [],
-          remark: '',
+          remark: "",
           remarkOptions: [],
           enabledmark: undefined
-        },
+        }
       },
       Vmodel: "",
       currVmodel: "",
@@ -1064,89 +1177,180 @@ export default {
         deliveryProductRelationList: [],
         businessOrderInfoList: [],
         version: 0,
-        saleOrderInfo: [],
+        saleOrderInfo: []
       },
       tableRequiredData: {},
-      dataRule:
-      {
+      dataRule: {
         businessId: [
           {
             required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
+            message: "请选择",
+            trigger: "change"
+          }
         ],
         subjectId: [
           {
             required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
+            message: "请选择",
+            trigger: "change"
+          }
         ],
         deliveryAddress: [
           {
             required: true,
-            message: '请输入',
-            trigger: 'blur'
-          },
+            message: "请输入",
+            trigger: "blur"
+          }
         ],
         enterpriseId: [
           {
             required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
+            message: "请选择",
+            trigger: "change"
+          }
         ],
         warehouseId: [
           {
             required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
+            message: "请选择",
+            trigger: "change"
+          }
         ],
         shippingAddress: [
           {
             required: true,
-            message: '请选择',
-            trigger: 'change'
-          },
-        ],
+            message: "请选择",
+            trigger: "change"
+          }
+        ]
+      },
+      orderTypeOptions: [
+        { fullName: "标准销售", id: "1" },
+        { fullName: "计划销售", id: "2" },
+        { fullName: "合同销售", id: "3" },
+        { fullName: "其他销售", id: "4" }
+      ],
+      orderTypeProps: { label: "fullName", value: "id" },
+      businessOrderTypeOptions: [
+        { fullName: "钢材类", id: "1" },
+        { fullName: "设备类", id: "2" },
+        { fullName: "废钢类", id: "3" },
+        { fullName: "低值易耗品", id: "4" },
+        { fullName: "合金类", id: "5" },
+        { fullName: "矿产类", id: "6" }
+      ],
+      businessOrderTypeProps: { label: "fullName", value: "id" },
+      currencyOptions: [
+        { fullName: "人民币", id: "1" },
+        { fullName: "港元", id: "2" },
+        { fullName: "美元", id: "3" },
+        { fullName: "欧元", id: "4" },
+        { fullName: "加币", id: "5" },
+        { fullName: "日元", id: "6" },
+        { fullName: "台币", id: "7" }
+      ],
+      currencyProps: { label: "fullName", value: "id" },
+      saleModeOptions: [
+        { fullName: "以销定采", id: "1" },
+        { fullName: "以采定销", id: "2" }
+      ],
+      saleModeProps: { label: "fullName", value: "id" },
+      transactionModeOptions: [
+        { fullName: "快递交货", id: "1" },
+        { fullName: "送货上门", id: "2" },
+        { fullName: "上门提货", id: "3" }
+      ],
+      transactionModeProps: { label: "fullName", value: "id" },
+      transportModeOptions: [
+        { fullName: "公路", id: "1" },
+        { fullName: "铁路", id: "2" },
+        { fullName: "轮船", id: "3" },
+        { fullName: "空运", id: "4" },
+        { fullName: "无", id: "5" }
+      ],
+      transportModeProps: { label: "fullName", value: "id" },
+      deliveryTypeOptions: [{ fullName: "销售发货", id: "2" }],
+      deliveryTypeProps: { label: "fullName", value: "id" },
+      businessIdcolumnOptions: [
+        { label: "订单编号", value: "code" },
+        { label: "客户名称", value: "subjectName" },
+        { label: "销售数量", value: "planPurchaseNum" },
+        { label: "销售金额", value: "taxCount" },
+        { label: "单据类型", value: "orderType1" },
+        { label: "配送方式", value: "deliveryType1" },
+        { label: "状态", value: "saleStatus" }
+      ],
+      reservedFields1columnOptions: [
+        { label: "业务线编码", value: "code" },
+        { label: "业务线名称", value: "name" }
+      ],
+      subjectIdcolumnOptions: [
+        { label: "客户编码", value: "code" },
+        { label: "客户名称", value: "name" }
+      ],
+      enterpriseIdcolumnOptions: [
+        { label: "机构编码", value: "f_en_code" },
+        { label: "机构名称", value: "f_full_name" }
+      ],
+      warehouseIdcolumnOptions: [
+        { label: "仓库编码", value: "code" },
+        { label: "仓库名称", value: "name" }
+      ],
+      shippingAddresscolumnOptions: [
+        { label: "业务类型", value: "addressType" },
+        { label: "国家", value: "country" },
+        { label: "详细地址", value: "addressDetail" }
+      ],
+      deliveryvoucherrelationvoucherIdcolumnOptions: [
+        { label: "凭证编号", value: "voucherCode" },
+        { label: "单据类型", value: "documentType" },
+        { label: "磅单编号", value: "poundCode" }
+      ],
+      deliveryvoucherrelationdocumentTypeOptions: [
+        { fullName: "收货凭证", id: "1" },
+        { fullName: "发货凭证", id: "2" }
+      ],
+      deliveryvoucherrelationdocumentTypeProps: {
+        label: "fullName",
+        value: "id"
       },
-      orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "计划销售", "id": "2" }, { "fullName": "合同销售", "id": "3" }, { "fullName": "其他销售", "id": "4" }],
-      orderTypeProps: { "label": "fullName", "value": "id" },
-      businessOrderTypeOptions: [{ "fullName": "钢材类", "id": "1" }, { "fullName": "设备类", "id": "2" }, { "fullName": "废钢类", "id": "3" }, { "fullName": "低值易耗品", "id": "4" }, { "fullName": "合金类", "id": "5" }, { "fullName": "矿产类", "id": "6" }],
-      businessOrderTypeProps: { "label": "fullName", "value": "id" },
-      currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }],
-      currencyProps: { "label": "fullName", "value": "id" },
-      saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }],
-      saleModeProps: { "label": "fullName", "value": "id" },
-      transactionModeOptions: [{ "fullName": "快递交货", "id": "1" }, { "fullName": "送货上门", "id": "2" }, { "fullName": "上门提货", "id": "3" }],
-      transactionModeProps: { "label": "fullName", "value": "id" },
-      transportModeOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }],
-      transportModeProps: { "label": "fullName", "value": "id" },
-      deliveryTypeOptions: [{ "fullName": "销售发货", "id": "2" }],
-      deliveryTypeProps: { "label": "fullName", "value": "id" },
-      businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "客户名称", "value": "subjectName" }, { label: "销售数量", value: "planPurchaseNum" }, { label: "销售金额", value: "taxCount" }, { "label": "单据类型", "value": "orderType1" }, { "label": "配送方式", "value": "deliveryType1" }, { "label": "状态", "value": "saleStatus" },],
-      reservedFields1columnOptions: [{ "label": "业务线编码", "value": "code" }, { "label": "业务线名称", "value": "name" },],
-      subjectIdcolumnOptions: [{ "label": "客户编码", "value": "code" }, { "label": "客户名称", "value": "name" },],
-      enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
-      warehouseIdcolumnOptions: [{ "label": "仓库编码", "value": "code" }, { "label": "仓库名称", "value": "name" },],
-      shippingAddresscolumnOptions: [{ "label": "业务类型", "value": "addressType" }, { "label": "国家", "value": "country" }, { "label": "详细地址", "value": "addressDetail" },],
-      deliveryvoucherrelationvoucherIdcolumnOptions: [{ "label": "凭证编号", "value": "voucherCode" }, { "label": "单据类型", "value": "documentType" }, { "label": "磅单编号", "value": "poundCode" },],
-      deliveryvoucherrelationdocumentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
-      deliveryvoucherrelationdocumentTypeProps: { "label": "fullName", "value": "id" },
-      deliveryvoucherrelationvoucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
-      deliveryvoucherrelationvoucherTypeProps: { "label": "fullName", "value": "id" },
-      deliveryvoucherrelationproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" },],
-      deliveryproductrelationproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" },],
-      deliveryproductrelationdeliveryUnitOptions: [{ "fullName": "吨", "id": "1" }, { "fullName": "千克", "id": "2" }],
-      deliveryproductrelationdeliveryUnitProps: { "label": "fullName", "value": "id" },
-      deliveryproductrelationcargoIdcolumnOptions: [{ label: "货区类型", value: "cargoType" },
-      { label: "货区名称", value: "cargoName" },
-      { label: "批次号", value: "batch_number" },
-      { label: "库存数量", value: "inventory_number" },
-      { label: "规格", value: "spec" }],
-      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
+      deliveryvoucherrelationvoucherTypeOptions: [
+        { fullName: "磅单", id: "1" },
+        { fullName: "收据", id: "2" },
+        { fullName: "其他", id: "3" }
+      ],
+      deliveryvoucherrelationvoucherTypeProps: {
+        label: "fullName",
+        value: "id"
+      },
+      deliveryvoucherrelationproductIdcolumnOptions: [
+        { label: "商品编码", value: "code" },
+        { label: "商品名称", value: "name" }
+      ],
+      deliveryproductrelationproductIdcolumnOptions: [
+        { label: "商品编码", value: "code" },
+        { label: "商品名称", value: "name" }
+      ],
+      deliveryproductrelationdeliveryUnitOptions: [
+        { fullName: "吨", id: "1" },
+        { fullName: "千克", id: "2" }
+      ],
+      deliveryproductrelationdeliveryUnitProps: {
+        label: "fullName",
+        value: "id"
+      },
+      deliveryproductrelationcargoIdcolumnOptions: [
+        { label: "货区类型", value: "cargoType" },
+        { label: "货区名称", value: "cargoName" },
+        { label: "批次号", value: "batch_number" },
+        { label: "库存数量", value: "inventory_number" },
+        { label: "规格", value: "spec" }
+      ],
+      vouchervehiclevehicleIdcolumnOptions: [
+        { label: "车牌号", value: "vehicle_number" },
+        { label: "驾驶员", value: "name" },
+        { label: "电话", value: "mobile" }
+      ],
       childIndex: -1,
       isEdit: false,
       interfaceRes: {
@@ -1158,8 +1362,30 @@ export default {
         subjectId: [],
         deliveryAddress: [],
         enterpriseId: [],
-        warehouseId: [{ "dataType": "varchar", "defaultValue": "", "field": "businessLineId", "fieldName": "", "id": "PneOdw1", "jnpfKey": "popupSelect", "relationField": "reservedFields1", "required": "0" }],
-        shippingAddress: [{ "dataType": "varchar", "defaultValue": "", "field": "businessOrganizeId", "fieldName": "", "id": "AyAmdw1", "jnpfKey": "popupSelect", "relationField": "warehouseId", "required": "0" }],
+        warehouseId: [
+          {
+            dataType: "varchar",
+            defaultValue: "",
+            field: "businessLineId",
+            fieldName: "",
+            id: "PneOdw1",
+            jnpfKey: "popupSelect",
+            relationField: "reservedFields1",
+            required: "0"
+          }
+        ],
+        shippingAddress: [
+          {
+            dataType: "varchar",
+            defaultValue: "",
+            field: "businessOrganizeId",
+            fieldName: "",
+            id: "AyAmdw1",
+            jnpfKey: "popupSelect",
+            relationField: "warehouseId",
+            required: "0"
+          }
+        ],
         remark: [],
         deliveryvoucherrelationvoucherId: [],
         deliveryvoucherrelationdocumentType: [],
@@ -1185,26 +1411,28 @@ export default {
         deliveryproductrelationtareWeight: [],
         deliveryproductrelationbuckleWeight: [],
         deliveryproductrelationnetWeight: [],
-        deliveryproductrelationcargoId: [{
-          fieldName: "",
-          field: "warehouseId",
-          defaultValue: "",
-          jnpfKey: "popupSelect",
-          dataType: "varchar",
-          id: "AyAmdw1",
-          relationField: "warehouseId",
-          required: "0"
-        },
-        {
-          fieldName: "",
-          field: "productId",
-          defaultValue: "",
-          jnpfKey: "popupSelect",
-          dataType: "varchar",
-          id: "AyAmdw1",
-          relationField: "deliveryProductRelationList-productId",
-          required: "0"
-        }],
+        deliveryproductrelationcargoId: [
+          {
+            fieldName: "",
+            field: "warehouseId",
+            defaultValue: "",
+            jnpfKey: "popupSelect",
+            dataType: "varchar",
+            id: "AyAmdw1",
+            relationField: "warehouseId",
+            required: "0"
+          },
+          {
+            fieldName: "",
+            field: "productId",
+            defaultValue: "",
+            jnpfKey: "popupSelect",
+            dataType: "varchar",
+            id: "AyAmdw1",
+            relationField: "deliveryProductRelationList-productId",
+            required: "0"
+          }
+        ],
         deliveryproductrelationdeliveryNum: [],
         deliveryproductrelationbatchNo: [],
         deliveryproductrelationproduceTime: [],
@@ -1213,38 +1441,53 @@ export default {
         deliveryproductrelationtaxCount: [],
         deliveryproductrelationnotTaxPrice: [],
         deliveryproductrelationnotTaxCount: [],
-        deliveryproductrelationremark: [],
-      },
-    }
+        deliveryproductrelationremark: []
+      }
+    };
   },
   computed: {
     formOperates() {
-      return this.setting.formOperates
+      return this.setting.formOperates;
     }
   },
   watch: {},
   created() {
-    this.getFormById()
-    if (this.dataForm.id == null || this.dataForm.id == '' && this.dataForm.id == undefined || this.dataForm.id == 0) {
-      this.initDefaultData()
+    this.getFormById();
+    if (
+      this.dataForm.id == null ||
+      (this.dataForm.id == "" && this.dataForm.id == undefined) ||
+      this.dataForm.id == 0
+    ) {
+      this.initDefaultData();
     }
-    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm));
   },
   mounted() {
     this.initPurchaseData();
   },
   methods: {
     getSummaries(param) {
-      const summaryField = ["saleNum", "grossWeight", "tareWeight", "buckleWeight", "netWeight", "clearWeight", "deliveryNum", "inventoryNo", "taxCount", "notTaxCount"];
+      const summaryField = [
+        "saleNum",
+        "grossWeight",
+        "tareWeight",
+        "buckleWeight",
+        "netWeight",
+        "clearWeight",
+        "deliveryNum",
+        "inventoryNo",
+        "taxCount",
+        "notTaxCount"
+      ];
       const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
         if (index === 0) {
-          sums[index] = '合计';
+          sums[index] = "合计";
           return;
         }
         if (!summaryField.includes(column.property)) {
-          sums[index] = '';
+          sums[index] = "";
           return;
         }
         const values = data.map(item => Number(item[column.property]));
@@ -1262,7 +1505,7 @@ export default {
             sums[index] = thousandsFormat(sums[index]);
           }
         } else {
-          sums[index] = '';
+          sums[index] = "";
         }
       });
       return sums;
@@ -1277,39 +1520,59 @@ export default {
       //   });
       //   return;
       // }
-      let idx = index
+      let idx = index;
       for (let i = 0; i < val2.length; i++) {
         if (i == 0) {
-          this.dataForm.deliveryProductRelationList[idx].cargoId = undefined
-          this.dataForm.deliveryProductRelationList[idx].batchNo = undefined
-          this.dataForm.deliveryProductRelationList[idx].produceDate = undefined
-          this.dataForm.deliveryProductRelationList[idx].inventoryNo = undefined
-          this.dataForm.deliveryProductRelationList[idx].cargoId = val2[0].cargoId
-          this.dataForm.deliveryProductRelationList[idx].batchNo = val2[0].batch_number
-          this.dataForm.deliveryProductRelationList[idx].produceDate = val2[0].produce_date
-          this.dataForm.deliveryProductRelationList[idx].inventoryNo = val2[0].inventory_number
+          this.dataForm.deliveryProductRelationList[idx].cargoId = undefined;
+          this.dataForm.deliveryProductRelationList[idx].batchNo = undefined;
+          this.dataForm.deliveryProductRelationList[
+            idx
+          ].produceDate = undefined;
+          this.dataForm.deliveryProductRelationList[
+            idx
+          ].inventoryNo = undefined;
+          this.dataForm.deliveryProductRelationList[idx].cargoId =
+            val2[0].cargoId;
+          this.dataForm.deliveryProductRelationList[idx].batchNo =
+            val2[0].batch_number;
+          this.dataForm.deliveryProductRelationList[idx].produceDate =
+            val2[0].produce_date;
+          this.dataForm.deliveryProductRelationList[idx].inventoryNo =
+            val2[0].inventory_number;
         } else {
-          let item = JSON.parse(JSON.stringify(this.dataForm.deliveryProductRelationList[index]))
-          this.createdeliveryproductrelationList(item)
-          this.dataForm.deliveryProductRelationList[idx].cargoId = val2[i].cargoId
-          this.dataForm.deliveryProductRelationList[idx].batchNo = val2[i].batch_number
-          this.dataForm.deliveryProductRelationList[idx].produceDate = val2[i].produce_date
-          this.dataForm.deliveryProductRelationList[idx].inventoryNo = val2[i].inventory_number
+          let item = JSON.parse(
+            JSON.stringify(this.dataForm.deliveryProductRelationList[index])
+          );
+          this.createdeliveryproductrelationList(item);
+          this.dataForm.deliveryProductRelationList[idx].cargoId =
+            val2[i].cargoId;
+          this.dataForm.deliveryProductRelationList[idx].batchNo =
+            val2[i].batch_number;
+          this.dataForm.deliveryProductRelationList[idx].produceDate =
+            val2[i].produce_date;
+          this.dataForm.deliveryProductRelationList[idx].inventoryNo =
+            val2[i].inventory_number;
         }
-        idx++
+        idx++;
       }
       // this.inventoryIdList.push(val2.id)
     },
     //选择数据弹窗
     choiceProduct() {
-      this.BomgoodsBoxVisible = true
+      this.BomgoodsBoxVisible = true;
       let excludeIdList = [];
-      for (let i = 0; i < this.dataForm.deliveryProductRelationList.length; i++) {
-        excludeIdList.push(this.dataForm.deliveryProductRelationList[i].productId);
+      for (
+        let i = 0;
+        i < this.dataForm.deliveryProductRelationList.length;
+        i++
+      ) {
+        excludeIdList.push(
+          this.dataForm.deliveryProductRelationList[i].productId
+        );
       }
       this.$nextTick(() => {
-        this.$refs.BomGoodsBox.init(excludeIdList)
-      })
+        this.$refs.BomGoodsBox.init(excludeIdList);
+      });
     },
     initProductList(list) {
       for (let i = 0; i < list.length; i++) {
@@ -1327,9 +1590,9 @@ export default {
           taxCount: e.taxCount,
           notTaxPrice: e.notTaxPrice,
           notTaxCount: e.notTaxCount,
-          lastSalePrice: e.lastSalePrice,
-        }
-        this.dataForm.deliveryProductRelationList.push(item)
+          lastSalePrice: e.lastSalePrice
+        };
+        this.dataForm.deliveryProductRelationList.push(item);
       }
     },
     //选择凭证弹窗
@@ -1342,18 +1605,31 @@ export default {
         });
         return;
       }
-      this.voucherBoxVisible = true
+      this.voucherBoxVisible = true;
       let excludeIdList = [];
-      for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {
-        excludeIdList.push(this.dataForm.deliveryVoucherRelationList[i].voucherId);
+      for (
+        let i = 0;
+        i < this.dataForm.deliveryVoucherRelationList.length;
+        i++
+      ) {
+        excludeIdList.push(
+          this.dataForm.deliveryVoucherRelationList[i].voucherId
+        );
       }
-      let businessType = '2';
-      let documentType = '2';
+      let businessType = "2";
+      let documentType = "2";
       let businessId = this.dataForm.businessId;
-      let type = '3';
+      let type = "3";
       this.$nextTick(() => {
-        this.$refs.VoucherBox.init(excludeIdList, businessType, documentType, this.productIdList, businessId, type)
-      })
+        this.$refs.VoucherBox.init(
+          excludeIdList,
+          businessType,
+          documentType,
+          this.productIdList,
+          businessId,
+          type
+        );
+      });
     },
     initVoucherList(list) {
       for (let i = 0; i < list.length; i++) {
@@ -1375,18 +1651,22 @@ export default {
           tareWeight: e.tareWeight,
           buckleWeight: e.buckleWeight,
           netWeight: e.netWeight,
-          businessType: '4',
+          businessType: "4",
           clearWeight: e.clearWeight,
-          orderNo: e.orderNo,
-        }
-        this.dataForm.deliveryVoucherRelationList.push(item)
-        let productEntity = {}
+          orderNo: e.orderNo
+        };
+        this.dataForm.deliveryVoucherRelationList.push(item);
+        let productEntity = {};
         e.productWarehouseEntityList.forEach(item => {
           let obj = {};
           if (unit.orderNo) {
-            obj = this.productByOrderList.find(e => e.productId == item.id && e.ordLn == item.orderNo) || {};
+            obj =
+              this.productByOrderList.find(
+                e => e.productId == item.id && e.ordLn == item.orderNo
+              ) || {};
           } else {
-            obj = this.productByOrderList.find(e => e.productId == item.id) || {};
+            obj =
+              this.productByOrderList.find(e => e.productId == item.id) || {};
           }
           item.salesMainUnitId = obj.salesMainUnitId;
           item.saleNum = obj.businessNum;
@@ -1401,36 +1681,58 @@ export default {
           item.businessType = "4";
           item.productName = item.name;
           productEntity = item;
-        })
+        });
         if (this.dataForm.deliveryProductRelationList.length == 0) {
-          this.dataForm.deliveryProductRelationList.push(productEntity)
+          this.dataForm.deliveryProductRelationList.push(productEntity);
         } else {
-          const product = this.dataForm.deliveryProductRelationList.find(net => net.id == productEntity.id && net.deliveryUnit == productEntity.deliveryUnit && net.orderNo == productEntity.orderNo)
+          const product = this.dataForm.deliveryProductRelationList.find(
+            net =>
+              net.id == productEntity.id &&
+              net.deliveryUnit == productEntity.deliveryUnit &&
+              net.orderNo == productEntity.orderNo
+          );
           if (product) {
-            product.netWeight = this.jnpf.floatAdd(product.netWeight, productEntity.netWeight)
-            product.grossWeight = this.jnpf.floatAdd(product.grossWeight, productEntity.grossWeight)
-            product.tareWeight = this.jnpf.floatAdd(product.tareWeight, productEntity.tareWeight)
-            product.buckleWeight = this.jnpf.floatAdd(product.buckleWeight, productEntity.buckleWeight)
-            product.clearWeight = this.jnpf.floatAdd(product.clearWeight, productEntity.clearWeight)
+            product.netWeight = this.jnpf.floatAdd(
+              product.netWeight,
+              productEntity.netWeight
+            );
+            product.grossWeight = this.jnpf.floatAdd(
+              product.grossWeight,
+              productEntity.grossWeight
+            );
+            product.tareWeight = this.jnpf.floatAdd(
+              product.tareWeight,
+              productEntity.tareWeight
+            );
+            product.buckleWeight = this.jnpf.floatAdd(
+              product.buckleWeight,
+              productEntity.buckleWeight
+            );
+            product.clearWeight = this.jnpf.floatAdd(
+              product.clearWeight,
+              productEntity.clearWeight
+            );
           } else {
-            this.dataForm.deliveryProductRelationList.push(productEntity)
+            this.dataForm.deliveryProductRelationList.push(productEntity);
           }
         }
       }
     },
     getSaleDeliveryVoucher(val, val2) {
-      val2.voucherId = val2.id
-      val2.businessType = "4"
-      this.dataForm.deliveryVoucherRelationList.push(val2)
-      this.dataForm.deliveryVoucherRelationList.splice(0, 1)
+      val2.voucherId = val2.id;
+      val2.businessType = "4";
+      this.dataForm.deliveryVoucherRelationList.push(val2);
+      this.dataForm.deliveryVoucherRelationList.splice(0, 1);
       val2.productWarehouseEntityList.forEach((item, index) => {
-        item.productId = item.id
-        item.businessType = "4"
-      })
-      this.dataForm.deliveryProductRelationList.push(val2.productWarehouseEntityList[0])
+        item.productId = item.id;
+        item.businessType = "4";
+      });
+      this.dataForm.deliveryProductRelationList.push(
+        val2.productWarehouseEntityList[0]
+      );
     },
     getSaleOrder(val, val2) {
-      // if (val2.yunguanMark != 'Y') {
+      // if (val2.erpMark != '200') {
       //   this.dataForm.businessId = undefined
       //   this.$message({
       //     message: '运管暂未返回正常订单状态',
@@ -1439,108 +1741,123 @@ export default {
       //   });
       //   return
       // }
-      this.dataForm.businessOrderInfoList = []
-      this.dataForm.businessOrderInfoList[0] = val2
-      this.dataForm.subjectId = val2.firstSubjectBasicId
-      this.dataForm.deliveryAddress = val2.receiveAddress
-      this.dataForm.enterpriseId = val2.enterpriseId
-      this.dataForm.warehouseId = val2.deliveryWarehouse
-      this.dataForm.shippingAddress = val2.deliveryAddress
-      this.dataForm.reservedFields1 = val2.businessLineId
+      this.dataForm.businessOrderInfoList = [];
+      this.dataForm.businessOrderInfoList[0] = val2;
+      this.dataForm.subjectId = val2.firstSubjectBasicId;
+      this.dataForm.deliveryAddress = val2.receiveAddress;
+      this.dataForm.enterpriseId = val2.enterpriseId;
+      this.dataForm.warehouseId = val2.deliveryWarehouse;
+      this.dataForm.shippingAddress = val2.deliveryAddress;
+      this.dataForm.reservedFields1 = val2.businessLineId;
       val2.businessOrderProductRelationalList.forEach((item, index) => {
-        this.productIdList.push(item.productId)
-        item.productName = item.name
-        item.saleNum = item.businessNum
-        item.deliveryUnit = item.salesMainUnitId
-        item.returnUnit = item.businessPrice
-        item.businessType = "4"
-      })
-      this.dataForm.deliveryProductRelationList = val2.businessOrderProductRelationalList
-      this.productByOrderList = val2.businessOrderProductRelationalList
+        this.productIdList.push(item.productId);
+        item.productName = item.name;
+        item.saleNum = item.businessNum;
+        item.deliveryUnit = item.salesMainUnitId;
+        item.returnUnit = item.businessPrice;
+        item.businessType = "4";
+      });
+      this.dataForm.deliveryProductRelationList =
+        val2.businessOrderProductRelationalList;
+      this.productByOrderList = val2.businessOrderProductRelationalList;
     },
 
     initPurchaseData() {
-      const data = this.setting.selectData
+      const data = this.setting.selectData;
       if (!data) {
-        return
+        return;
       }
-      if (data.flag == '发货凭证生成发货单') {
+      if (data.flag == "发货凭证生成发货单") {
         this.dataForm.deliveryProductRelationList = [];
         data.forEach(item => {
           item.voucherId = item.id;
-          item.businessType = '4'
+          item.businessType = "4";
           this.dataForm.deliveryVoucherRelationList.push(item);
-          this.dataForm.deliveryProductRelationList = [...this.dataForm.deliveryProductRelationList, ...item.voucherProductList];
+          this.dataForm.deliveryProductRelationList = [
+            ...this.dataForm.deliveryProductRelationList,
+            ...item.voucherProductList
+          ];
           if (item.businessOrderId) {
             let purchaseId = {
               businessOrderId: item.businessOrderId
-            }
+            };
             request({
               url: `/api/scm/BusinessOrder/createDeliveryOrderByVoucher`,
-              method: 'get',
+              method: "get",
               data: purchaseId
-            }).then(res => {
-              if (res.data.length > 0) {
-                var purchaseOrder = res.data[0];
-                this.dataForm.businessId = purchaseOrder.id
-                this.dataForm.reservedFields1 = purchaseOrder.businessLineId
-                this.dataForm.subjectId = purchaseOrder.firstSubjectBasicId
-                this.dataForm.shippingAddress = purchaseOrder.deliveryAddress
-                this.dataForm.enterpriseId = purchaseOrder.enterpriseId
-                this.dataForm.warehouseId = purchaseOrder.deliveryWarehouse
-                this.dataForm.deliveryAddress = purchaseOrder.receiveAddress
-                this.dataForm.businessOrderInfoList = res.data
-                // purchaseOrder.businessOrderProductRelationalList.forEach(e => {
-                //   const target = this.dataForm.deliveryProductRelationList.find(p => e.productId == p.productId && e.salesMainUnitId == p.unit)
-                //   if (target) {
-                //     target.businessType = '1'
-                //     target.inventoryUnitId = e.inventoryUnitId
-                //     target.salesMainUnitId = e.salesMainUnitId
-                //     target.saleNum = e.businessNum
-                //     target.deliveryUnit = e.salesMainUnitId
-                //     target.returnUnit = e.businessPrice
-                //     target.tax = e.tax
-                //     target.taxCount = e.taxCount
-                //     target.notTaxPrice = e.notTaxPrice
-                //     target.notTaxCount = e.notTaxCount
-                //   }
-                // })
-                this.dataForm.deliveryProductRelationList.find((p) => {
-                  const e = purchaseOrder.businessOrderProductRelationalList.find(q => {
-                    return q.productId == p.productId && q.salesMainUnitId == p.unit
-                  })
-                  if (e) {
-                    p.businessType = '4'
-                    p.inventoryUnitId = e.inventoryUnitId
-                    p.salesMainUnitId = e.salesMainUnitId
-                    p.saleNum = e.businessNum
-                    p.deliveryUnit = e.salesMainUnitId
-                    p.returnUnit = e.businessPrice
-                    p.tax = e.tax
-                    p.taxCount = e.taxCount
-                    p.notTaxPrice = e.notTaxPrice
-                    p.notTaxCount = e.notTaxCount
-                  }
-                })
-                const defaultArr = this.dataForm.deliveryProductRelationList
-                this.dataForm.deliveryProductRelationList.splice(0, this.dataForm.deliveryProductRelationList.length, ...defaultArr)
-              } else {
-                this.$message({
-                  type: 'error',
-                  message: "销售订单未审核",
-                  onClose: () => {
-                    this.$router.go(-1)
-                  }
-                });
-              }
-            }).catch(() => { })
+            })
+              .then(res => {
+                if (res.data.length > 0) {
+                  var purchaseOrder = res.data[0];
+                  this.dataForm.businessId = purchaseOrder.id;
+                  this.dataForm.reservedFields1 = purchaseOrder.businessLineId;
+                  this.dataForm.subjectId = purchaseOrder.firstSubjectBasicId;
+                  this.dataForm.shippingAddress = purchaseOrder.deliveryAddress;
+                  this.dataForm.enterpriseId = purchaseOrder.enterpriseId;
+                  this.dataForm.warehouseId = purchaseOrder.deliveryWarehouse;
+                  this.dataForm.deliveryAddress = purchaseOrder.receiveAddress;
+                  this.dataForm.businessOrderInfoList = res.data;
+                  // purchaseOrder.businessOrderProductRelationalList.forEach(e => {
+                  //   const target = this.dataForm.deliveryProductRelationList.find(p => e.productId == p.productId && e.salesMainUnitId == p.unit)
+                  //   if (target) {
+                  //     target.businessType = '1'
+                  //     target.inventoryUnitId = e.inventoryUnitId
+                  //     target.salesMainUnitId = e.salesMainUnitId
+                  //     target.saleNum = e.businessNum
+                  //     target.deliveryUnit = e.salesMainUnitId
+                  //     target.returnUnit = e.businessPrice
+                  //     target.tax = e.tax
+                  //     target.taxCount = e.taxCount
+                  //     target.notTaxPrice = e.notTaxPrice
+                  //     target.notTaxCount = e.notTaxCount
+                  //   }
+                  // })
+                  this.dataForm.deliveryProductRelationList.find(p => {
+                    const e = purchaseOrder.businessOrderProductRelationalList.find(
+                      q => {
+                        return (
+                          q.productId == p.productId &&
+                          q.salesMainUnitId == p.unit
+                        );
+                      }
+                    );
+                    if (e) {
+                      p.businessType = "4";
+                      p.inventoryUnitId = e.inventoryUnitId;
+                      p.salesMainUnitId = e.salesMainUnitId;
+                      p.saleNum = e.businessNum;
+                      p.deliveryUnit = e.salesMainUnitId;
+                      p.returnUnit = e.businessPrice;
+                      p.tax = e.tax;
+                      p.taxCount = e.taxCount;
+                      p.notTaxPrice = e.notTaxPrice;
+                      p.notTaxCount = e.notTaxCount;
+                    }
+                  });
+                  const defaultArr = this.dataForm.deliveryProductRelationList;
+                  this.dataForm.deliveryProductRelationList.splice(
+                    0,
+                    this.dataForm.deliveryProductRelationList.length,
+                    ...defaultArr
+                  );
+                } else {
+                  this.$message({
+                    type: "error",
+                    message: "销售订单未审核",
+                    onClose: () => {
+                      this.$router.go(-1);
+                    }
+                  });
+                }
+              })
+              .catch(() => { });
           }
         });
       }
     },
     changeData(model, index) {
-      this.isEdit = false
-      this.childIndex = index
+      this.isEdit = false;
+      this.childIndex = index;
       let modelAll = model.split("-");
       let faceMode = "";
       for (let i = 0; i < modelAll.length; i++) {
@@ -1548,14 +1865,14 @@ export default {
       }
       for (let key in this.interfaceRes) {
         if (key != faceMode) {
-          let faceReList = this.interfaceRes[key]
+          let faceReList = this.interfaceRes[key];
           for (let i = 0; i < faceReList.length; i++) {
             if (faceReList[i].relationField == model) {
-              let options = 'get' + key + 'Options';
+              let options = "get" + key + "Options";
               if (this[options]) {
-                this[options]()
+                this[options]();
               }
-              this.changeData(key, index)
+              this.changeData(key, index);
             }
           }
         }
@@ -1566,180 +1883,212 @@ export default {
         if (type == 2) {
           for (let i = 0; i < this.dataForm[data].length; i++) {
             if (index == -1) {
-              this.dataForm[data][i][model] = defaultValue
+              this.dataForm[data][i][model] = defaultValue;
             } else if (index == i) {
-              this.dataForm[data][i][model] = defaultValue
+              this.dataForm[data][i][model] = defaultValue;
             }
           }
         } else {
-          this.dataForm[data] = defaultValue
+          this.dataForm[data] = defaultValue;
         }
       }
     },
-    dataAll() {
-    },
+    dataAll() { },
     selfGetInfo(dataForm) {
-      this.dataInfo(dataForm)
+      this.dataInfo(dataForm);
     },
     beforeSubmit() {
-      const _data = this.dataList()
-      return _data
+      const _data = this.dataList();
+      return _data;
     },
     selfInit() {
-      this.dataAll()
+      this.dataAll();
     },
     getFormById() {
       getFormById("530411417380062341").then(res => {
-        this.dataForm.flowId = res.data && res.data.flowId
+        this.dataForm.flowId = res.data && res.data.flowId;
         // this.encode = res.data&&res.data.encode
-      })
+      });
     },
     exist() {
-      let isOk = true
+      let isOk = true;
       for (let key in this.tableRequiredData) {
         if (this.dataForm[key] && Array.isArray(this.dataForm[key])) {
           for (let i = 0; i < this.dataForm[key].length; i++) {
-            let item = this.dataForm[key][i]
+            let item = this.dataForm[key][i];
             inner: for (let id in item) {
-              let arr = this.tableRequiredData[key].filter(o => o.id === id) || []
-              if (!arr.length) continue inner
+              let arr =
+                this.tableRequiredData[key].filter(o => o.id === id) || [];
+              if (!arr.length) continue inner;
               if (arr[0].required) {
-                let msg = `${arr[0].name}不能为空`
-                let boo = true
-                if (arr[0].dataType === 'array') {
-                  boo = !this.jnpf.isEmptyArray(item[id])
+                let msg = `${arr[0].name}不能为空`;
+                let boo = true;
+                if (arr[0].dataType === "array") {
+                  boo = !this.jnpf.isEmptyArray(item[id]);
                 } else {
-                  boo = !this.jnpf.isEmpty(item[id])
+                  boo = !this.jnpf.isEmpty(item[id]);
                 }
                 if (!boo) {
                   this.$message({
                     message: msg,
-                    type: 'error',
+                    type: "error",
                     duration: 1000
-                  })
-                  isOk = false
-                  break
+                  });
+                  isOk = false;
+                  break;
                 }
               }
             }
           }
         }
       }
-      if (!this.deliveryvoucherrelationExist()) return
-      if (!this.deliveryproductrelationExist()) return
-      return isOk
+      if (!this.deliveryvoucherrelationExist()) return;
+      if (!this.deliveryproductrelationExist()) return;
+      return isOk;
     },
     deliveryvoucherrelationExist() {
       let isOk = true;
-      for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {
+      for (
+        let i = 0;
+        i < this.dataForm.deliveryVoucherRelationList.length;
+        i++
+      ) {
         const e = this.dataForm.deliveryVoucherRelationList[i];
       }
       return isOk;
     },
     deliveryproductrelationExist() {
       let isOk = true;
-      for (let i = 0; i < this.dataForm.deliveryProductRelationList.length; i++) {
+      for (
+        let i = 0;
+        i < this.dataForm.deliveryProductRelationList.length;
+        i++
+      ) {
         const e = this.dataForm.deliveryProductRelationList[i];
-        debugger
+        debugger;
         if (!e.cargoId) {
           this.$message({
             message: "货区名称不能为空",
-            type: 'error',
+            type: "error",
             duration: 1000
-          })
-          isOk = false
-          break
+          });
+          isOk = false;
+          break;
         }
         if (!e.deliveryNum) {
           this.$message({
             message: "发货数量不能为空",
-            type: 'error',
+            type: "error",
             duration: 1000
-          })
-          isOk = false
-          break
+          });
+          isOk = false;
+          break;
         }
       }
       return isOk;
     },
     goBack() {
-      this.$emit('refresh')
+      this.$emit("refresh");
     },
     clearData() {
-      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
     },
     //初始化默认数据
-    initDefaultData() {
-
-    },
+    initDefaultData() { },
     adddeliveryvoucherrelationList() {
       let item = {
-        voucherId: '',
-        documentType: '',
-        voucherType: '',
+        voucherId: "",
+        documentType: "",
+        voucherType: "",
         poundCode: undefined,
         poundlistTime: undefined,
         vehicleId: undefined,
-        productId: '',
+        productId: "",
         spec: undefined,
         unit: undefined,
         grossWeight: undefined,
         tareWeight: undefined,
         buckleWeight: undefined,
         netWeight: undefined,
-        remark: undefined,
-      }
-      this.getdeliveryvoucherrelationList(item)
+        remark: undefined
+      };
+      this.getdeliveryvoucherrelationList(item);
     },
     deldeliveryvoucherrelationList(scope) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
-        const delObj = scope.row
-        var productId = delObj.id
-        var unit = delObj.unit
-        var productNetWeight = delObj.netWeight
-        var productGrossWeight = delObj.grossWeight
-        var productTareWeight = delObj.tareWeight
-        var productBuckleWeight = delObj.buckleWeight
-        var productClearWeight = delObj.clearWeight
-        var orderNo = delObj.orderNo
-        const target = this.dataForm.deliveryProductRelationList.find(e => e.id == productId && e.deliveryUnit == unit && e.orderNo == orderNo)
-        if (target.netWeight == productNetWeight) {
-          const idx = this.dataForm.deliveryProductRelationList.findIndex(e => e.id == productId && e.deliveryUnit == unit && e.orderNo == orderNo)
-          this.dataForm.deliveryProductRelationList.splice(idx, 1)
-        } else {
-          target.netWeight = this.jnpf.floatSub(target.netWeight, productNetWeight)
-          target.grossWeight = this.jnpf.floatSub(target.grossWeight, productGrossWeight)
-          target.tareWeight = this.jnpf.floatSub(target.tareWeight, productTareWeight)
-          target.buckleWeight = this.jnpf.floatSub(target.buckleWeight, productBuckleWeight)
-          target.clearWeight = this.jnpf.floatSub(target.clearWeight, productClearWeight)
-        }
-        this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
-      }).catch(() => {
-      });
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          const delObj = scope.row;
+          var productId = delObj.id;
+          var unit = delObj.unit;
+          var productNetWeight = delObj.netWeight;
+          var productGrossWeight = delObj.grossWeight;
+          var productTareWeight = delObj.tareWeight;
+          var productBuckleWeight = delObj.buckleWeight;
+          var productClearWeight = delObj.clearWeight;
+          var orderNo = delObj.orderNo;
+          const target = this.dataForm.deliveryProductRelationList.find(
+            e =>
+              e.id == productId &&
+              e.deliveryUnit == unit &&
+              e.orderNo == orderNo
+          );
+          if (target.netWeight == productNetWeight) {
+            const idx = this.dataForm.deliveryProductRelationList.findIndex(
+              e =>
+                e.id == productId &&
+                e.deliveryUnit == unit &&
+                e.orderNo == orderNo
+            );
+            this.dataForm.deliveryProductRelationList.splice(idx, 1);
+          } else {
+            target.netWeight = this.jnpf.floatSub(
+              target.netWeight,
+              productNetWeight
+            );
+            target.grossWeight = this.jnpf.floatSub(
+              target.grossWeight,
+              productGrossWeight
+            );
+            target.tareWeight = this.jnpf.floatSub(
+              target.tareWeight,
+              productTareWeight
+            );
+            target.buckleWeight = this.jnpf.floatSub(
+              target.buckleWeight,
+              productBuckleWeight
+            );
+            target.clearWeight = this.jnpf.floatSub(
+              target.clearWeight,
+              productClearWeight
+            );
+          }
+          this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
+        })
+        .catch(() => { });
     },
     getdeliveryvoucherrelationList(value) {
-      let item = { ...this.tableRows.deliveryVoucherRelationList, ...value }
-      this.dataForm.deliveryVoucherRelationList.push(item)
-      this.childIndex = this.dataForm.deliveryVoucherRelationList.length - 1
-      this.isEdit = true
-      this.isEdit = false
-      this.childIndex = -1
+      let item = { ...this.tableRows.deliveryVoucherRelationList, ...value };
+      this.dataForm.deliveryVoucherRelationList.push(item);
+      this.childIndex = this.dataForm.deliveryVoucherRelationList.length - 1;
+      this.isEdit = true;
+      this.isEdit = false;
+      this.childIndex = -1;
     },
     adddeliveryproductrelationList() {
       let item = {
-        productId: '',
+        productId: "",
         spec: undefined,
         inventoryUnitId: undefined,
         salesMainUnitId: undefined,
         saleNum: undefined,
-        deliveryUnit: '',
+        deliveryUnit: "",
         grossWeight: undefined,
         tareWeight: undefined,
         buckleWeight: undefined,
         netWeight: undefined,
-        cargoId: '',
+        cargoId: "",
         deliveryNum: undefined,
         batchNo: undefined,
         inventoryNo: undefined,
@@ -1749,117 +2098,118 @@ export default {
         taxCount: undefined,
         notTaxPrice: undefined,
         notTaxCount: undefined,
-        remark: undefined,
-      }
-      this.getdeliveryproductrelationList(item)
+        remark: undefined
+      };
+      this.getdeliveryproductrelationList(item);
     },
     createdeliveryproductrelationList(val) {
-      let item = JSON.parse(JSON.stringify(val))
-      item.cargoId = undefined
-      item.deliveryNum = undefined
-      item.batchNo = undefined
-      item.inventoryNo = undefined
-      item.produceDate = undefined
-      item.saleNum = 0
-      item.taxCount = 0
-      item.notTaxCount = 0
-      this.dataForm.deliveryProductRelationList.push(item)
-      this.childIndex = this.dataForm.deliveryProductRelationList.length - 1
-      this.isEdit = true
-      this.isEdit = false
-      this.childIndex = -1
+      let item = JSON.parse(JSON.stringify(val));
+      item.cargoId = undefined;
+      item.deliveryNum = undefined;
+      item.batchNo = undefined;
+      item.inventoryNo = undefined;
+      item.produceDate = undefined;
+      item.saleNum = 0;
+      item.taxCount = 0;
+      item.notTaxCount = 0;
+      this.dataForm.deliveryProductRelationList.push(item);
+      this.childIndex = this.dataForm.deliveryProductRelationList.length - 1;
+      this.isEdit = true;
+      this.isEdit = false;
+      this.childIndex = -1;
     },
     deldeliveryproductrelationList(index) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
-        this.dataForm.deliveryProductRelationList.splice(index, 1);
-      }).catch(() => {
-      });
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.dataForm.deliveryProductRelationList.splice(index, 1);
+        })
+        .catch(() => { });
     },
     getdeliveryproductrelationList(value) {
-      let item = { ...this.tableRows.deliveryProductRelationList, ...value }
-      this.dataForm.deliveryProductRelationList.push(item)
-      this.childIndex = this.dataForm.deliveryProductRelationList.length - 1
-      this.isEdit = true
-      this.isEdit = false
-      this.childIndex = -1
+      let item = { ...this.tableRows.deliveryProductRelationList, ...value };
+      this.dataForm.deliveryProductRelationList.push(item);
+      this.childIndex = this.dataForm.deliveryProductRelationList.length - 1;
+      this.isEdit = true;
+      this.isEdit = false;
+      this.childIndex = -1;
     },
     openSelectDialog(key) {
-      this.currTableConf = this.addTableConf[key]
-      this.currVmodel = key
-      this.selectDialogVisible = true
+      this.currTableConf = this.addTableConf[key];
+      this.currVmodel = key;
+      this.selectDialogVisible = true;
       this.$nextTick(() => {
-        this.$refs.selectDialog.init()
-      })
+        this.$refs.selectDialog.init();
+      });
     },
     addForSelect(data) {
       for (let i = 0; i < data.length; i++) {
-        let t = data[i]
-        if (this['get' + this.currVmodel]) {
-          this['get' + this.currVmodel](t)
+        let t = data[i];
+        if (this["get" + this.currVmodel]) {
+          this["get" + this.currVmodel](t);
         }
       }
     },
     dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
       let timeDataValue = null;
-      let timeValue = Number(timeValueData)
+      let timeValue = Number(timeValueData);
       if (timeRule) {
         if (timeType == 1) {
-          timeDataValue = timeValue
+          timeDataValue = timeValue;
         } else if (timeType == 2) {
-          timeDataValue = dataValue
+          timeDataValue = dataValue;
         } else if (timeType == 3) {
-          timeDataValue = new Date().getTime()
+          timeDataValue = new Date().getTime();
         } else if (timeType == 4) {
-          let previousDate = '';
+          let previousDate = "";
           if (timeTarget == 1 || timeTarget == 2) {
-            previousDate = getDateDay(timeTarget, timeType, timeValue)
-            timeDataValue = new Date(previousDate).getTime()
+            previousDate = getDateDay(timeTarget, timeType, timeValue);
+            timeDataValue = new Date(previousDate).getTime();
           } else if (timeTarget == 3) {
-            previousDate = getBeforeData(timeValue)
-            timeDataValue = new Date(previousDate).getTime()
+            previousDate = getBeforeData(timeValue);
+            timeDataValue = new Date(previousDate).getTime();
           } else {
-            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime();
           }
         } else if (timeType == 5) {
-          let previousDate = '';
+          let previousDate = "";
           if (timeTarget == 1 || timeTarget == 2) {
-            previousDate = getDateDay(timeTarget, timeType, timeValue)
-            timeDataValue = new Date(previousDate).getTime()
+            previousDate = getDateDay(timeTarget, timeType, timeValue);
+            timeDataValue = new Date(previousDate).getTime();
           } else if (timeTarget == 3) {
-            previousDate = getLaterData(timeValue)
-            timeDataValue = new Date(previousDate).getTime()
+            previousDate = getLaterData(timeValue);
+            timeDataValue = new Date(previousDate).getTime();
           } else {
-            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime();
           }
         }
       }
       return timeDataValue;
     },
     time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-      let timeDataValue = null
+      let format = formatType == "HH:mm" ? "HH:mm:00" : formatType;
+      let timeDataValue = null;
       if (timeRule) {
         if (timeType == 1) {
-          timeDataValue = timeValue || '00:00:00'
-          if (timeDataValue.split(':').length == 3) {
-            timeDataValue = timeDataValue
+          timeDataValue = timeValue || "00:00:00";
+          if (timeDataValue.split(":").length == 3) {
+            timeDataValue = timeDataValue;
           } else {
-            timeDataValue = timeDataValue + ':00'
+            timeDataValue = timeDataValue + ":00";
           }
         } else if (timeType == 2) {
-          timeDataValue = dataValue
+          timeDataValue = dataValue;
         } else if (timeType == 3) {
-          timeDataValue = this.jnpf.toDate(new Date(), format)
+          timeDataValue = this.jnpf.toDate(new Date(), format);
         } else if (timeType == 4) {
-          let previousDate = '';
-          previousDate = getBeforeTime(timeTarget, timeValue)
-          timeDataValue = this.jnpf.toDate(previousDate, format)
+          let previousDate = "";
+          previousDate = getBeforeTime(timeTarget, timeValue);
+          timeDataValue = this.jnpf.toDate(previousDate, format);
         } else if (timeType == 5) {
-          let previousDate = '';
-          previousDate = getLaterTime(timeTarget, timeValue)
-          timeDataValue = this.jnpf.toDate(previousDate, format)
+          let previousDate = "";
+          previousDate = getLaterTime(timeTarget, timeValue);
+          timeDataValue = this.jnpf.toDate(previousDate, format);
         }
       }
       return timeDataValue;
@@ -1869,22 +2219,21 @@ export default {
       return _data;
     },
     dataInfo(dataAll) {
-      let _dataAll = dataAll
-      this.dataForm = _dataAll
-      this.isEdit = true
-      this.dataAll()
+      let _dataAll = dataAll;
+      this.dataForm = _dataAll;
+      this.isEdit = true;
+      this.dataAll();
       for (let i = 0; i < _dataAll.deliveryVoucherRelationList.length; i++) {
-        this.childIndex = i
+        this.childIndex = i;
       }
       for (let i = 0; i < _dataAll.deliveryProductRelationList.length; i++) {
-        this.childIndex = i
+        this.childIndex = i;
       }
       for (let i = 0; i < _dataAll.businessOrderInfoList.length; i++) {
-        this.childIndex = i
+        this.childIndex = i;
       }
-      this.childIndex = -1
-    },
-  },
-}
-
+      this.childIndex = -1;
+    }
+  }
+};
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
index 82772375..f6cf21ae 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
@@ -212,7 +212,7 @@
                 @click="handleDelVoucher(scope.row.id)">删除
               </el-button>
 
-              <!-- <template v-if="scope.row.flowState == '2' && scope.row.yunguanMark !== 'Y'">
+              <!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
                 <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
               </template> -->
             </template>
@@ -435,7 +435,7 @@ export default {
       })
     },
     outBoundNotice(row) {
-      // if (row.yunguanMark !== 'Y') {
+      // if (row.erpMark != '200') {
       //   this.$message({
       //     type: 'error',
       //     message: '运管暂未返回正常订单状态',
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
index ce0ecc12..d929cac2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
@@ -151,7 +151,7 @@
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
-              <!-- <template v-if="scope.row.flowState == '2' && scope.row.yunguanMark !== 'Y'">
+              <!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
                 <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
               </template> -->
             </template>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
index bb4ae5dd..c16ffb2f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
@@ -157,7 +157,7 @@
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
-              <!-- <template v-if="scope.row.flowState == '2' && scope.row.yunguanMark !== 'Y'">
+              <!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
                 <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
               </template> -->
             </template>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
index 0e6ee4f5..22dcf5c1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
@@ -167,7 +167,7 @@
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
-              <!-- <template v-if="scope.row.flowState == '2' && scope.row.yunguanMark !== 'Y'">
+              <!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
                 <el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
               </template> -->
             </template>
@@ -590,7 +590,7 @@ export default {
     },
 
     addOstarts(row, status) {
-      // if (row.yunguanMark !== 'Y') {
+      // if (row.erpMark != '200') {
       //   this.$message({
       //     type: 'error',
       //     message: '运管暂未返回正常订单状态',
@@ -652,7 +652,7 @@ export default {
     },
 
     addOstartsRescind(row, status) {
-      // if (row.yunguanMark !== 'Y') {
+      // if (row.erpMark != '200') {
       //   this.$message({
       //     type: 'error',
       //     message: '运管暂未返回正常订单状态',
@@ -703,7 +703,7 @@ export default {
     },
 
     addOrUpdateHandleOver(row, isDetail) {
-      // if (row.yunguanMark !== 'Y') {
+      // if (row.erpMark != '200') {
       //   this.$message({
       //     type: 'error',
       //     message: '运管暂未返回正常订单状态',