diff --git a/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java b/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
index eb81ffd5..c2ea6909 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
+++ b/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
@@ -92,7 +92,7 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
 
         this.setFieldValByName("lastModifyUserName", userInfo.getUserName(), metaObject);
 
-        this.setFieldValByName("organizeId", organizeId, metaObject);
+        this.setFieldValByName("organizeJsonId", organizeId, metaObject);
         this.setFieldValByName("companyId", companyId, metaObject);
         this.setFieldValByName("departmentId", userInfo.getDepartmentId(), metaObject);
 //        System.out.println(userProvider.getDepartmentId(userInfo.getUserId()));
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java
index 0a6986cd..51647467 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java
@@ -32,17 +32,17 @@ public class ContractClauseEntity  {
     private String remark;
     @TableField(value = "ATTACHMENT" , updateStrategy = FieldStrategy.IGNORED)
     private String attachment;
-    @TableField("F_CREATOR_TIME")
+    @TableField(value = "F_CREATOR_TIME", fill = FieldFill.INSERT)
     private Date creatorTime;
-    @TableField("F_CREATOR_USER_ID")
+    @TableField(value = "F_CREATOR_USER_ID", fill = FieldFill.INSERT)
     private String creatorUserId;
-    @TableField("F_LAST_MODIFY_TIME")
+    @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
-    @TableField("F_LAST_MODIFY_USER_ID")
+    @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
-    @TableField("F_DELETE_TIME")
+    @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE)
     private Date deleteTime;
-    @TableField("F_DELETE_USER_ID")
+    @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE)
     private String deleteUserId;
     @TableField("F_DELETE_MARK")
     private Integer deleteMark;
@@ -52,4 +52,10 @@ public class ContractClauseEntity  {
     private String flowId;
     @TableField("F_VERSION")
     private Integer version;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java
index e59f2580..4962ea64 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java
@@ -103,17 +103,17 @@ public class ContractLEntity  {
     private String extendedField;
     @TableField("BIDDING")
     private String bidding;
-    @TableField("F_CREATOR_TIME")
+    @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT)
     private Date creatorTime;
-    @TableField("F_CREATOR_USER_ID")
+    @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT)
     private String creatorUserId;
-    @TableField("F_LAST_MODIFY_TIME")
+    @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
-    @TableField("F_LAST_MODIFY_USER_ID")
+    @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
-    @TableField("F_DELETE_TIME")
+    @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE)
     private Date deleteTime;
-    @TableField("F_DELETE_USER_ID")
+    @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE)
     private String deleteUserId;
     @TableField("F_DELETE_MARK")
     private Integer deleteMark;
@@ -147,4 +147,10 @@ public class ContractLEntity  {
     private List<SubjectbasicEntity> subjectbasicEntityList;
     @TableField(exist = false)
     private List<ProductByContractModel> productByContractModelList;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java
index bebbebce..243e9611 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java
@@ -56,17 +56,17 @@ public class ContractTemplateEntity  {
     private String openSignTimeB;
     @TableField(value = "OPEN_SIGNED_AT_B" , updateStrategy = FieldStrategy.IGNORED)
     private String openSignedAtB;
-    @TableField("F_CREATOR_TIME")
+    @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT)
     private Date creatorTime;
-    @TableField("F_CREATOR_USER_ID")
+    @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT)
     private String creatorUserId;
-    @TableField("F_LAST_MODIFY_TIME")
+    @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
-    @TableField("F_LAST_MODIFY_USER_ID")
+    @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
-    @TableField("F_DELETE_TIME")
+    @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE)
     private Date deleteTime;
-    @TableField("F_DELETE_USER_ID")
+    @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE)
     private String deleteUserId;
     @TableField("F_DELETE_MARK")
     private Integer deleteMark;
@@ -76,4 +76,10 @@ public class ContractTemplateEntity  {
     private String flowId;
     @TableField("F_VERSION")
     private Integer version;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEarlyWarningEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEarlyWarningEntity.java
index 656d123a..552af154 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEarlyWarningEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEarlyWarningEntity.java
@@ -68,10 +68,12 @@ public class InventoryEarlyWarningEntity  {
     private Integer deleteMark;
     @TableField("F_TENANT_ID")
     private String tenantId;
-    @TableField("COMPANY_ID")
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
     private String companyId;
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_VERSION")
     private Integer version;
     @TableField("F_FLOW_ID")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java
index bfb0fc5f..67d16e6f 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java
@@ -63,10 +63,12 @@ public class InventoryEntity  {
     private Integer deleteMark;
     @TableField("F_TENANT_ID")
     private String tenantId;
-    @TableField("COMPANY_ID")
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
     private String companyId;
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_VERSION")
     private Integer version;
     @TableField("F_FLOW_ID")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryLogEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryLogEntity.java
index ff6e870d..42630e32 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryLogEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryLogEntity.java
@@ -72,10 +72,12 @@ public class InventoryLogEntity  {
     private Integer deleteMark;
     @TableField("F_TENANT_ID")
     private String tenantId;
-    @TableField("COMPANY_ID")
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
     private String companyId;
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_VERSION")
     private Integer version;
     @TableField("F_FLOW_ID")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventorySnapshotEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventorySnapshotEntity.java
index ef247bd6..82157a76 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventorySnapshotEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventorySnapshotEntity.java
@@ -85,10 +85,12 @@ public class InventorySnapshotEntity  {
     private Integer deleteMark;
     @TableField("F_TENANT_ID")
     private String tenantId;
-    @TableField("COMPANY_ID")
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
     private String companyId;
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_VERSION")
     private Integer version;
     @TableField("F_FLOW_ID")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java
index 7b0d74b6..3087f009 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java
@@ -48,4 +48,10 @@ public class ProductBrandEntity  {
     private String flowId;
     @TableField("F_VERSION")
     private Integer version;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java
index 3e0dddf1..b3ba2daa 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java
@@ -50,4 +50,10 @@ public class ProductCategoryEntity  {
     private String flowId;
     @TableField("F_VERSION")
     private Integer version;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductPriceEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductPriceEntity.java
index 40144b45..d8e409e7 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductPriceEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductPriceEntity.java
@@ -56,10 +56,12 @@ public class ProductPriceEntity  {
     private Integer deleteMark;
     @TableField("F_TENANT_ID")
     private String tenantId;
-    @TableField("COMPANY_ID")
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
     private String companyId;
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_FLOW_ID")
     private String flowId;
     @TableField("F_VERSION")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java
index 44c905e9..902df767 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java
@@ -46,4 +46,10 @@ public class ProductUnitwarehouseEntity  {
     private Integer version;
     @TableField("F_FLOW_ID")
     private String flowId;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
index 912a6c40..a97a2efb 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
@@ -244,4 +244,10 @@ public class ProductWarehouseEntity  {
     private String operateUnitIds;
     @TableField(exist = false)
     private String orderMainUnitIds;
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBlacklistEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBlacklistEntity.java
index 88504706..3626f0f6 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBlacklistEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectBlacklistEntity.java
@@ -56,4 +56,6 @@ public class SubjectBlacklistEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectSettlementRulesEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectSettlementRulesEntity.java
index 161efee6..88bd2bde 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectSettlementRulesEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectSettlementRulesEntity.java
@@ -72,6 +72,8 @@ public class SubjectSettlementRulesEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_FLOW_TASK_ID")
     private String flowTaskId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java
index 5f3e8409..5323384f 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java
@@ -66,4 +66,6 @@ public class SubjectaccountperiodrulesEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesnoEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesnoEntity.java
index a31c921b..4f6e91a4 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesnoEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesnoEntity.java
@@ -42,6 +42,8 @@ public class SubjectaccountperiodrulesnoEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_FLOW_TASK_ID")
     private String flowTaskId;
     @TableField("F_VERSION")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbasicEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbasicEntity.java
index 7a1c542f..240e0596 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbasicEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbasicEntity.java
@@ -236,4 +236,6 @@ public class SubjectbasicEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingEntity.java
index 194dbc9b..3d565fe5 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingEntity.java
@@ -54,4 +54,6 @@ public class SubjectcreditratingEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingnoEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingnoEntity.java
index ade920c6..0b800c60 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingnoEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditratingnoEntity.java
@@ -42,6 +42,8 @@ public class SubjectcreditratingnoEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_FLOW_TASK_ID")
     private String flowTaskId;
     @TableField("F_VERSION")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesEntity.java
index cd013c48..b3d62271 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesEntity.java
@@ -48,6 +48,8 @@ public class SubjectcreditrulesEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
     @TableField("F_FLOW_TASK_ID")
     private String flowTaskId;
     @TableField("F_FLOW_ID")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesscoreEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesscoreEntity.java
index 4d233777..b6fdbca7 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesscoreEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcreditrulesscoreEntity.java
@@ -44,4 +44,6 @@ public class SubjectcreditrulesscoreEntity  {
     private String companyId;
     @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
index 1848c383..9b18a7c8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
@@ -734,12 +734,6 @@
                                     </template>
                                     <template slot-scope="scope">
                                         {{ scope.row.commodityCode }}
-                                        <!-- <JnpfInput v-model="scope.row.commodityCode"
-                                            @change="changeData('contractlcommodity-commodityCode', scope.$index)"
-                                            placeholder="请输入"
-                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-commodityCode')"
-                                            readonly clearable :style='{ "width": "100%" }'>
-                                        </JnpfInput> -->
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="商品名称" v-if="judgeShow('contractlcommodity-commodityName')"
@@ -750,12 +744,6 @@
                                     </template>
                                     <template slot-scope="scope">
                                         {{ scope.row.commodityName }}
-                                        <!-- <JnpfInput v-model="scope.row.commodityName"
-                                            @change="changeData('contractlcommodity-commodityName', scope.$index)"
-                                            placeholder="请输入"
-                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-commodityName')"
-                                            readonly clearable :style='{ "width": "100%" }'>
-                                        </JnpfInput> -->
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="商品规格" v-if="judgeShow('contractlcommodity-specifications')"
@@ -766,12 +754,6 @@
                                     </template>
                                     <template slot-scope="scope">
                                         {{ scope.row.specifications }}
-                                        <!-- <JnpfInput v-model="scope.row.specifications"
-                                            @change="changeData('contractlcommodity-specifications', scope.$index)"
-                                            placeholder="请输入"
-                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-specifications')"
-                                            readonly clearable :style='{ "width": "100%" }'>
-                                        </JnpfInput> -->
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="库存单位" v-if="judgeShow('contractlcommodity-inventoryUnitId')"
@@ -782,12 +764,6 @@
                                     </template>
                                     <template slot-scope="scope">
                                         {{ getProductUnitName(scope.row.inventoryUnitId) }}
-                                        <!-- <JnpfInput v-model="scope.row.inventoryUnitId"
-                                            @change="changeData('contractlcommodity-inventoryUnitId', scope.$index)"
-                                            placeholder="请输入"
-                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-inventoryUnitId')"
-                                            readonly clearable :style='{ "width": "100%" }'>
-                                        </JnpfInput> -->
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="采购单位" v-if="judgeShow('contractlcommodity-procureUnit')"
@@ -802,7 +778,7 @@
                                             placeholder="请选择"
                                             :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-procureUnit')"
                                             clearable :style='{ "width": "100%" }'
-                                            :options="contractlcommodityprocureUnitOptions"
+                                            :options="scope.row.contractlcommodityprocureUnitOptions"
                                             :props="contractlcommodityprocureUnitProps">
                                         </JnpfSelect>
                                     </template>
@@ -1184,8 +1160,6 @@ 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 katex from 'katex';
-import 'katex/dist/katex.min.css';
 export default {
     mixins: [comMixin],
     components: {},
@@ -1567,98 +1541,6 @@ export default {
         this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
     },
     mounted() {
-        this.$nextTick(function () {
-
-            katex.render(String.raw`
-                  \frac {客户销售结算金额（含税）- \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2} 
-                  = 理论销售结算金额（含税）}{\boxed{结算吨数}} - \boxed{固定利润2} - \boxed{其他费用3} + \boxed{其他费用4}
-                  = 采购单价（含税）
-                 `
-                , this.$refs.elTestA, {
-                throwOnError: false
-            });
-            katex.render(String.raw`
-                  \frac {\frac {\frac { 客户销售结算金额（含税价） } {\lparen 1 + \boxed{税率} \rparen }
-                  = 客户销售结算金额（不含税价） - \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2}} {\boxed{结算吨数}}
-                  = 理论销售结算单价（不含税） \times \lparen 1 + 税率 \rparen
-                  = 理论销售结算单价（含税） \times \lparen 1 - \boxed{黄牛税负率} - \boxed{资金利率} \rparen
-                  = 黄牛结算价}{ \lparen 1 — \boxed{开票公司税负率} \rparen }
-                  = 采购单价（含税）
-                 `
-                , this.$refs.elTestB, {
-                throwOnError: false
-            });
-            katex.render(String.raw`
-                  \frac {黄牛结算价 
-                    = 理论销售结算单价（含税） \times \lparen 1 - \boxed{黄牛税负率} - \boxed{资金利率} \rparen - \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2} } { \lparen 1 -\boxed{ 开票公司税负率} \rparen}
-                    = 采购单价（含税）
-                 `
-                , this.$refs.elTestC, {
-                throwOnError: false
-            });
-            katex.render(String.raw`
-                  \frac { 总资金利息
-                  = 销售总金额（含税） \times \lparen 1 + \boxed{资金利率} \rparen - \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2}} {\boxed{对应吨数}}
-                  = 销售单价（含税）
-                 `
-                , this.$refs.elTestD, {
-                throwOnError: false
-            });
-            katex.render(String.raw`
-                  \begin{matrix} 
-                  垫付采购金额
-                  = \lparen 客户开标价（上标段） - \boxed{固定金额} \rparen \times 吨数
-                  \\ 
-                  实际销售单价
-                  = 客户开标价（售卖标段）
-                  \\
-                  资金利息
-                  = 垫付采购金额 \times \lparen 1 + \boxed{利率} \rparen
-                  \\
-                  利润金额
-                  = \lparen \boxed{户头费} + \boxed{装卸费} - \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2} \rparen \times 吨数 + 资金利息
-                  \\ 
-                  补交采购金额
-                  = 客户开标价（售卖标段） \times 吨数 - 利润金额 - 垫付采购金额
-                  \end{matrix}
-                 `
-                , this.$refs.elTestE, {
-                throwOnError: false
-            });
-            katex.render(String.raw`
-                  \begin{matrix} 
-                  垫付采购单价（含税） = 市场价（含税） \\
-                  实际销售单价（含税） = 实际客户价（含税） \\
-                  \frac {黄牛结算单价 
-                  = 实际销售单价（含税） \times \lparen 1 - \boxed{黄牛税负率} \rparen - \boxed{倒运费} - \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2}} {\lparen 1 - \boxed{开票公司税负率} \rparen}
-                  = 实际采购单价（含税）
-                  = 开票公司结算价（含税）
-                  \end{matrix}
-                 `
-                , this.$refs.elTestF, {
-                throwOnError: false
-            });
-            katex.render(String.raw`
-                 \begin{matrix} 
-                 垫付采购单价=市场价 \\
-                 实际销售单价=实际客户价 \\
-                 加工费运费 = 实际销售单价（不含税） \times \lparen 1 - \boxed{客户税负率} \rparen - 毛料加权平均单价（不含税） \times \boxed{销售吨数} - 资金占用利息
-                 \end{matrix}
-                 `
-                , this.$refs.elTestG, {
-                throwOnError: false
-            });
-            katex.render(String.raw`
-                  \begin{matrix} 
-                  \lparen 采购结算单价（不含税） \times \lparen 1 + \boxed{税率} \rparen - \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2} \rparen \times \lparen 1 - \boxed{客户税负率} \rparen - \boxed{固定利润1} - \boxed{其他费用1} + \boxed{其他费用2}
-                  = 采购单价（含税） \\
-                  实际销售单价 = 客户结算单单价
-                  \end{matrix}
-                 `
-                , this.$refs.elTestH, {
-                throwOnError: false
-            });
-        })
     },
     methods: {
         getSubjectInfo() {
@@ -1706,7 +1588,9 @@ export default {
                         for (let i = 0; i < JSON.parse(productInfo.order_main_unit_id).length; i++) {
                             procureUnitOptionsArr.push({ "fullName": JSON.parse(productInfo.order_main_unit_name)[i], "id": JSON.parse(productInfo.order_main_unit_id)[i] })
                         }
-                        this.contractlcommodityprocureUnitOptions = procureUnitOptionsArr
+                        this.dataForm.contractLCommodityList[index]['contractlcommodityprocureUnitOptions'] = procureUnitOptionsArr
+                        // console.log(procureUnitOptionsArr)
+                        // this.contractlcommodityprocureUnitOptions = procureUnitOptionsArr
                     }
                 }).catch(() => { })
             }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
index 25b3c642..72447fa2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
@@ -797,18 +797,20 @@ export default {
             }
         },
         'unitProductUnitwarehouseId': function (nUnitId, oUnitId) {
-            if (nUnitId != '') {
-                this.dataForm.inventoryUnitId = this.dataForm.productUnitList[0]['productUnitCode']
-                this.dataForm.orderMainUnitId = [this.dataForm.productUnitList[0]['productUnitCode']]
-                this.dataForm.salesMainUnitId = [this.dataForm.productUnitList[0]['productUnitCode']]
-                this.dataForm.operateUnitId = this.dataForm.productUnitList[0]['productUnitCode']
-                this.dataForm.pricingUnitId = this.dataForm.productUnitList[0]['productUnitCode']
-            } else {
-                this.dataForm.inventoryUnitId = ''
-                this.dataForm.orderMainUnitId = []
-                this.dataForm.salesMainUnitId = []
-                this.dataForm.operateUnitId = ''
-                this.dataForm.pricingUnitId = ''
+            if (this.dataForm.id == '') {
+                if (nUnitId != '') {
+                    this.dataForm.inventoryUnitId = this.dataForm.productUnitList[0]['productUnitCode']
+                    this.dataForm.orderMainUnitId = [this.dataForm.productUnitList[0]['productUnitCode']]
+                    this.dataForm.salesMainUnitId = [this.dataForm.productUnitList[0]['productUnitCode']]
+                    this.dataForm.operateUnitId = this.dataForm.productUnitList[0]['productUnitCode']
+                    this.dataForm.pricingUnitId = this.dataForm.productUnitList[0]['productUnitCode']
+                } else {
+                    this.dataForm.inventoryUnitId = ''
+                    this.dataForm.orderMainUnitId = []
+                    this.dataForm.salesMainUnitId = []
+                    this.dataForm.operateUnitId = ''
+                    this.dataForm.pricingUnitId = ''
+                }
             }
         },
         'productUnitList': function (nUnitId, oUnitId) {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue
index 545983a1..c6733cd3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue
@@ -54,30 +54,30 @@
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column label="价格类型" prop="priceTypeName" algin="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="priceNo" label="价格编号" align="center" width="250" sortable fixed="left">
           </el-table-column>
-          <el-table-column prop="productName" label="商品" align="left">
+          <el-table-column label="价格类型" prop="priceTypeName" align="center" width="150" sortable fixed="left">
           </el-table-column>
-          <el-table-column prop="makerName" label="报价方" align="left">
+          <el-table-column prop="productName" label="商品" align="center" width="200" sortable fixed="left">
           </el-table-column>
-          <el-table-column :prop="startTime" label="有效时间开始" align="left">
+          <el-table-column prop="makerName" label="报价方" align="center" width="250">
+          </el-table-column>
+          <el-table-column :prop="startTime" label="有效时间开始" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.startTime | toDate("yyyy-MM-dd") }}
             </template>
           </el-table-column>
-          <el-table-column :prop="endTime" label="有效时间结束" align="left">
+          <el-table-column :prop="endTime" label="有效时间结束" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.endTime | toDate("yyyy-MM-dd") }}
             </template>
           </el-table-column>
-          <el-table-column prop="price" label="价格" align="left">
-          </el-table-column>
-          <el-table-column prop="priceNo" label="价格编号" align="left">
+          <el-table-column prop="price" label="价格" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="unitName" label="计价单位" align="left">
+          <el-table-column prop="unitName" label="计价单位" align="center" width="150">
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" align="center" fixed="right" width="150">
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productprice/productpriceIndex.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productprice/productpriceIndex.vue
index caffa984..a61f06d8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productprice/productpriceIndex.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productprice/productpriceIndex.vue
@@ -54,28 +54,28 @@
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column label="价格类型" prop="priceTypeName" algin="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="priceNo" label="价格编号" align="center" width="250">
           </el-table-column>
-          <el-table-column prop="productName" label="商品" align="left">
+          <el-table-column label="价格类型" prop="priceTypeName" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="makerName" label="报价方" align="left">
+          <el-table-column prop="productName" label="商品" align="center" width="250">
           </el-table-column>
-          <el-table-column :prop="startTime" label="有效时间开始" align="left">
+          <el-table-column prop="makerName" label="报价方" align="center">
+          </el-table-column>
+          <el-table-column :prop="startTime" label="有效时间开始" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.startTime | toDate("yyyy-MM-dd") }}
             </template>
           </el-table-column>
-          <el-table-column :prop="endTime" label="有效时间结束" align="left">
+          <el-table-column :prop="endTime" label="有效时间结束" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.endTime | toDate("yyyy-MM-dd") }}
             </template>
           </el-table-column>
-          <el-table-column prop="price" label="价格" align="left">
-          </el-table-column>
-          <el-table-column prop="priceNo" label="价格编号" align="left">
+          <el-table-column prop="price" label="价格" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="unitName" label="计价单位" align="left">
+          <el-table-column prop="unitName" label="计价单位" align="center" width="150">
           </el-table-column>
           <!-- <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue
index b73966b1..bcb845d1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基本信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('inventoryType')">
             <jnpf-form-tip-item label="业务类型" v-if="judgeShow('inventoryType')" prop="inventoryType">
@@ -55,10 +55,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="盘点规则" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">盘点规则</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('stocktakingMode')">
             <jnpf-form-tip-item label="盘点方式" v-if="judgeShow('stocktakingMode')" prop="stocktakingMode">
@@ -86,20 +86,20 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="实盘录入" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">实盘录入</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.warehousingInventoryProductList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
+              <el-table :data="dataForm.warehousingInventoryProductList" size='mini' border>
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                 <el-table-column label="商品名称" v-if="judgeShow('warehousinginventoryproduct-productId')"
-                  prop="productId">
+                  prop="productId" align="center" width="220" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginventoryproductList-productId')">*</span>商品名称
@@ -118,7 +118,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" v-if="judgeShow('warehousinginventoryproduct-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('warehousinginventoryproduct-spec')" prop="spec" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign" v-if="judgeRequired('warehousinginventoryproductList-spec')">*</span>规格
@@ -134,7 +134,7 @@
                 </el-table-column>
 
                 <el-table-column label="库存单位" v-if="judgeShow('warehousinginventoryproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -152,7 +152,7 @@
                 </el-table-column>
 
                 <el-table-column label="商品分类" v-if="judgeShow('warehousinginventoryproduct-categoryName')"
-                  prop="categoryName">
+                  prop="categoryName" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -168,7 +168,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="品牌" v-if="judgeShow('warehousinginventoryproduct-brandName')" prop="brandName">
+                <el-table-column label="品牌" v-if="judgeShow('warehousinginventoryproduct-brandName')" prop="brandName" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -185,7 +185,7 @@
                 </el-table-column>
 
                 <el-table-column label="实盘数量" v-if="judgeShow('warehousinginventoryproduct-firmOfferQuantity')"
-                  prop="firmOfferQuantity">
+                  prop="firmOfferQuantity" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -202,7 +202,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="货区名称" v-if="judgeShow('warehousinginventoryproduct-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('warehousinginventoryproduct-cargoId')" prop="cargoId" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -223,7 +223,7 @@
 
 
                 <el-table-column label="批次号" v-if="judgeShow('warehousinginventoryproduct-batchNumber')"
-                  prop="batchNumber">
+                  prop="batchNumber" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -240,7 +240,7 @@
                 </el-table-column>
 
                 <el-table-column label="生产日期" v-if="judgeShow('warehousinginventoryproduct-dateManufacture')"
-                  prop="dateManufacture">
+                  prop="dateManufacture" align="center" width="220">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -257,7 +257,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginventoryproductList')">
+                <el-table-column label="操作" align="center" fixed="right" width="50" v-if="!judgeWrite('warehousinginventoryproductList')">
 
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue
index 1c12f9ae..cb7b248b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -12,15 +5,15 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="业务类型">
-              <JnpfSelect v-model="query.inventoryType" placeholder="请选择" clearable
-                :options="inventoryTypeOptions" :props="inventoryTypeProps">
+              <JnpfSelect v-model="query.inventoryType" placeholder="请选择" clearable :options="inventoryTypeOptions"
+                :props="inventoryTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="盘点开始时间">
-              <JnpfDateRangePicker v-model="query.inventoryTimeStart" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.inventoryTimeStart" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -37,8 +30,8 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
-                  startPlaceholder="开始日期" endPlaceholder="结束日期" />
+                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                  endPlaceholder="结束日期" />
               </el-form-item>
             </el-col>
           </template>
@@ -46,8 +39,7 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -60,11 +52,9 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
-              v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -76,40 +66,39 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column label="业务类型" prop="inventoryType" algin="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column label="业务类型" prop="inventoryType" align="center" sortable width="200" fixed="left">
             <template slot-scope="scope">
               {{ scope.row.inventoryType}}
             </template>
           </el-table-column>
-          <el-table-column prop="warehouseId" label="仓库名称" align="left">
+          <el-table-column prop="warehouseId" label="仓库名称" align="center" width="150" sortable fixed="left">
           </el-table-column>
-          <el-table-column prop="inventoryTimeStart" label="盘点开始时间" align="left">
+          <el-table-column prop="inventoryTimeStart" label="盘点开始时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="documentNo" label="单据编号" align="left">
+          <el-table-column prop="documentNo" label="单据编号" align="center" width="200">
           </el-table-column>
 
-          <el-table-column prop="productNum" label="商品种类数" align="left">
+          <el-table-column prop="productNum" label="商品种类数" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="productSum" label="商品总数量" align="left">
+          <el-table-column prop="productSum" label="商品总数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorUserId" label="创建用户" align="left">
+          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@@ -119,506 +108,580 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" align="center" width="150">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn"
-                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
-                @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
+                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize" @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
-      lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id"
-          @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-      @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-      @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
+  import request from '@/utils/request'
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import {
+    getFormById
+  } from '@/api/workFlow/FormDesign'
+  import {
+    getFlowList
+  } from '@/api/workFlow/FlowEngine'
+  import FlowBox from '@/views/workFlow/components/FlowBox'
+  import ExportBox from '@/components/ExportBox'
+  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import {
+    getConfigData
+  } from '@/api/onlineDev/visualDev'
+  import {
+    getDefaultCurrentValueUserIdAsync
+  } from '@/api/permission/user'
+  import {
+    getDefaultCurrentValueDepartmentIdAsync
+  } from '@/api/permission/organize'
+  import columnList from './columnList'
+  import {
+    thousandsFormat
+  } from "@/components/Generator/utils/index"
+  import SuperQuery from '@/components/SuperQuery'
+  import superQueryJson from './superQueryJson'
 
-import request from '@/utils/request'
-import { mapGetters } from "vuex";
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import { getFormById } from '@/api/workFlow/FormDesign'
-import { getFlowList } from '@/api/workFlow/FlowEngine'
-import FlowBox from '@/views/workFlow/components/FlowBox'
-import ExportBox from '@/components/ExportBox'
-import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-import { getConfigData } from '@/api/onlineDev/visualDev'
-import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-import columnList from './columnList'
-import { thousandsFormat } from "@/components/Generator/utils/index"
-import SuperQuery from '@/components/SuperQuery'
-import superQueryJson from './superQueryJson'
-
-export default {
-  components: {
-    FlowBox,
-    ExportBox, ToFormDetail, SuperQuery
-  },
-  data() {
-    return {
+  export default {
+    components: {
+      FlowBox,
+      ExportBox,
+      ToFormDetail,
+      SuperQuery
+    },
+    data() {
+      return {
 
-      keyword: '',
-      expandsTree: true,
-      refreshTree: true,
-      toFormDetailVisible: false,
-      expandObj: {},
-      columnOptions: [],
-      mergeList: [],
-      exportList: [],
-      columnList,
+        keyword: '',
+        expandsTree: true,
+        refreshTree: true,
+        toFormDetailVisible: false,
+        expandObj: {},
+        columnOptions: [],
+        mergeList: [],
+        exportList: [],
+        columnList,
 
-      showAll: false,
-      superQueryVisible: false,
-      superQueryJson,
-      uploadBoxVisible: false,
-      detailVisible: false,
-      query: {
-        inventoryType: undefined,
-        inventoryTimeStart: undefined,
-        documentNo: undefined,
-        creatorUserId: undefined,
-        creatorTime: undefined,
-      },
-      treeProps: {
-        children: 'children',
-        label: 'fullName',
-        value: 'id',
-        isLeaf: 'isLeaf'
-      },
-      list: [],
-      listLoading: true,
-      multipleSelection: [], total: 0,
-      queryData: {},
-      listQuery: {
-        superQueryJson: '',
-        currentPage: 1,
-        pageSize: 20,
-        sort: "desc",
-        sidx: "",
-      },
-      formVisible: false,
-      flowVisible: false,
-      flowListVisible: false,
-      flowList: [],
-      exportBoxVisible: false,
-      inventoryTypeOptions: [{ "fullName": "日常盘点单", "id": "1" }, { "fullName": "业务盘点单", "id": "2" }],
-      inventoryTypeProps: { "label": "fullName", "value": "id" },
-      stocktakingModeOptions: [{ "fullName": "静态盘点", "id": "1" }, { "fullName": "动态盘点", "id": "2" }],
-      stocktakingModeProps: { "label": "fullName", "value": "id" },
-      missingDiskRuleOptions: [{ "fullName": "漏盘商品不做盈亏调整", "id": "1" }, { "fullName": "漏盘商品账面库存自动清零", "id": "2" }],
-      missingDiskRuleProps: { "label": "fullName", "value": "id" },
-      duplicateInventoryRuleOptions: [{ "fullName": "累加汇总", "id": "1" }, { "fullName": "覆盖更新", "id": "2" }],
-      duplicateInventoryRuleProps: { "label": "fullName", "value": "id" },
-      tableField112_productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "批次号", "value": "batch_number" },],
-      interfaceRes: {
-        warehouseId: [],
-        tableField112_productId: [],
-      },
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    menuId() {
-      return this.$route.meta.modelId || ''
-    }
-  },
-  created() {
-    getFormById("529993401664295493").then(res1 => {
-      let flowId = res1.data && res1.data.id
-      getFlowList(flowId, '1').then(res2 => {
-        this.flowList = res2.data
-        this.getColumnList(),
-          this.initSearchDataAndListData()
-        this.queryData = JSON.parse(JSON.stringify(this.query))
-      }).catch((e) => {
-        this.$message({ type: 'error', message: e.message });
-        this.$router.push('/404');
-      })
-    })
-  },
-  methods: {
-    toDetail(defaultValue, modelId) {
-      if (!defaultValue) return
-      getConfigData(modelId).then(res => {
-        if (!res.data || !res.data.formData) return
-        let formData = JSON.parse(res.data.formData)
-        formData.popupType = 'general'
-        this.toFormDetailVisible = true
-        this.$nextTick(() => {
-          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+        showAll: false,
+        superQueryVisible: false,
+        superQueryJson,
+        uploadBoxVisible: false,
+        detailVisible: false,
+        query: {
+          inventoryType: undefined,
+          inventoryTimeStart: undefined,
+          documentNo: undefined,
+          creatorUserId: undefined,
+          creatorTime: undefined,
+        },
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id',
+          isLeaf: 'isLeaf'
+        },
+        list: [],
+        listLoading: true,
+        multipleSelection: [],
+        total: 0,
+        queryData: {},
+        listQuery: {
+          superQueryJson: '',
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        },
+        formVisible: false,
+        flowVisible: false,
+        flowListVisible: false,
+        flowList: [],
+        exportBoxVisible: false,
+        inventoryTypeOptions: [{
+          "fullName": "日常盘点单",
+          "id": "1"
+        }, {
+          "fullName": "业务盘点单",
+          "id": "2"
+        }],
+        inventoryTypeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        stocktakingModeOptions: [{
+          "fullName": "静态盘点",
+          "id": "1"
+        }, {
+          "fullName": "动态盘点",
+          "id": "2"
+        }],
+        stocktakingModeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        missingDiskRuleOptions: [{
+          "fullName": "漏盘商品不做盈亏调整",
+          "id": "1"
+        }, {
+          "fullName": "漏盘商品账面库存自动清零",
+          "id": "2"
+        }],
+        missingDiskRuleProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        duplicateInventoryRuleOptions: [{
+          "fullName": "累加汇总",
+          "id": "1"
+        }, {
+          "fullName": "覆盖更新",
+          "id": "2"
+        }],
+        duplicateInventoryRuleProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        tableField112_productIdcolumnOptions: [{
+          "label": "商品名称",
+          "value": "name"
+        }, {
+          "label": "商品编码",
+          "value": "code"
+        }, {
+          "label": "批次号",
+          "value": "batch_number"
+        }, ],
+        interfaceRes: {
+          warehouseId: [],
+          tableField112_productId: [],
+        },
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      getFormById("529993401664295493").then(res1 => {
+        let flowId = res1.data && res1.data.id
+        getFlowList(flowId, '1').then(res2 => {
+          this.flowList = res2.data
+          this.getColumnList(),
+            this.initSearchDataAndListData()
+          this.queryData = JSON.parse(JSON.stringify(this.query))
+        }).catch((e) => {
+          this.$message({
+            type: 'error',
+            message: e.message
+          });
+          this.$router.push('/404');
         })
       })
     },
-    toggleTreeExpand(expands) {
-      this.refreshTree = false
-      this.expandsTree = expands
-      this.$nextTick(() => {
-        this.refreshTree = true
+    methods: {
+      toDetail(defaultValue, modelId) {
+        if (!defaultValue) return
+        getConfigData(modelId).then(res => {
+          if (!res.data || !res.data.formData) return
+          let formData = JSON.parse(res.data.formData)
+          formData.popupType = 'general'
+          this.toFormDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+          })
+        })
+      },
+      toggleTreeExpand(expands) {
+        this.refreshTree = false
+        this.expandsTree = expands
         this.$nextTick(() => {
-          this.$refs.treeBox.setCurrentKey(null)
+          this.refreshTree = true
+          this.$nextTick(() => {
+            this.$refs.treeBox.setCurrentKey(null)
+          })
         })
-      })
-    },
-    filterNode(value, data) {
-      if (!value) return true;
-      return data[this.treeProps.label].indexOf(value) !== -1;
-    },
-    loadNode(node, resolve) {
-      const nodeData = node.data
-      const config = {
-        treeInterfaceId: "",
-        treeTemplateJson: []
-      }
-      if (config.treeInterfaceId) {
-        //这里是为了拿到参数中关联的字段的值，后端自行拿
-        if (config.treeTemplateJson && config.treeTemplateJson.length) {
-          for (let i = 0; i < config.treeTemplateJson.length; i++) {
-            const element = config.treeTemplateJson[i];
-            element.defaultValue = nodeData[element.relationField] || ''
-          }
-        }
-        //参数
-        let query = {
-          paramList: config.treeTemplateJson || [],
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data[this.treeProps.label].indexOf(value) !== -1;
+      },
+      loadNode(node, resolve) {
+        const nodeData = node.data
+        const config = {
+          treeInterfaceId: "",
+          treeTemplateJson: []
         }
-        //接口
-        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-          let data = res.data
-          if (Array.isArray(data)) {
-            resolve(data);
-          } else {
-            resolve([]);
+        if (config.treeInterfaceId) {
+          //这里是为了拿到参数中关联的字段的值，后端自行拿
+          if (config.treeTemplateJson && config.treeTemplateJson.length) {
+            for (let i = 0; i < config.treeTemplateJson.length; i++) {
+              const element = config.treeTemplateJson[i];
+              element.defaultValue = nodeData[element.relationField] || ''
+            }
           }
-        })
-      }
-    },
-    getColumnList() {
-      // 没有开启权限
-      this.columnOptions = this.transformColumnList(this.columnList)
-    },
-    transformColumnList(columnList) {
-      let list = []
-      for (let i = 0; i < columnList.length; i++) {
-        const e = columnList[i];
-        if (!e.prop.includes('-')) {
-          list.push(e)
-        } else {
-          let prop = e.prop.split('-')[0]
-          let label = e.label.split('-')[0]
-          let vModel = e.prop.split('-')[1]
-          let newItem = {
-            align: "center",
-            jnpfKey: "table",
-            prop,
-            label,
-            children: []
+          //参数
+          let query = {
+            paramList: config.treeTemplateJson || [],
           }
-          e.vModel = vModel
-          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-          if (!list.some(o => o.prop === prop)) list.push(newItem)
-          for (let i = 0; i < list.length; i++) {
-            if (list[i].prop === prop) {
-              list[i].children.push(e)
-              break
+          //接口
+          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+            let data = res.data
+            if (Array.isArray(data)) {
+              resolve(data);
+            } else {
+              resolve([]);
             }
-          }
+          })
         }
-      }
-      this.getMergeList(list)
-      this.getExportList(list)
-      return list
-    },
-    arraySpanMethod({ column }) {
-      for (let i = 0; i < this.mergeList.length; i++) {
-        if (column.property == this.mergeList[i].prop) {
-          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+      },
+      getColumnList() {
+        // 没有开启权限
+        this.columnOptions = this.transformColumnList(this.columnList)
+      },
+      transformColumnList(columnList) {
+        let list = []
+        for (let i = 0; i < columnList.length; i++) {
+          const e = columnList[i];
+          if (!e.prop.includes('-')) {
+            list.push(e)
+          } else {
+            let prop = e.prop.split('-')[0]
+            let label = e.label.split('-')[0]
+            let vModel = e.prop.split('-')[1]
+            let newItem = {
+              align: "center",
+              jnpfKey: "table",
+              prop,
+              label,
+              children: []
+            }
+            e.vModel = vModel
+            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+            if (!list.some(o => o.prop === prop)) list.push(newItem)
+            for (let i = 0; i < list.length; i++) {
+              if (list[i].prop === prop) {
+                list[i].children.push(e)
+                break
+              }
+            }
+          }
         }
-      }
-    },
-    getMergeList(list) {
-      let newList = JSON.parse(JSON.stringify(list))
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          let child = {
-            prop: item.prop + '-child-first'
+        this.getMergeList(list)
+        this.getExportList(list)
+        return list
+      },
+      arraySpanMethod({
+        column
+      }) {
+        for (let i = 0; i < this.mergeList.length; i++) {
+          if (column.property == this.mergeList[i].prop) {
+            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
           }
-          item.children.unshift(child)
         }
-      })
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          item.children.forEach((child, index) => {
-            if (index == 0) {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 1,
-                colspan: item.children.length
-              })
-            } else {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 0,
-                colspan: 0
-              })
+      },
+      getMergeList(list) {
+        let newList = JSON.parse(JSON.stringify(list))
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            let child = {
+              prop: item.prop + '-child-first'
             }
-          })
-        } else {
-          this.mergeList.push({
-            prop: item.prop,
-            rowspan: 1,
-            colspan: 1
-          })
-        }
-      })
-    },
-    getExportList(list) {
-      let exportList = []
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].jnpfKey === 'table') {
-          for (let j = 0; j < list[i].children.length; j++) {
-            exportList.push(list[i].children[j])
+            item.children.unshift(child)
+          }
+        })
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            item.children.forEach((child, index) => {
+              if (index == 0) {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 1,
+                  colspan: item.children.length
+                })
+              } else {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 0,
+                  colspan: 0
+                })
+              }
+            })
+          } else {
+            this.mergeList.push({
+              prop: item.prop,
+              rowspan: 1,
+              colspan: 1
+            })
+          }
+        })
+      },
+      getExportList(list) {
+        let exportList = []
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].jnpfKey === 'table') {
+            for (let j = 0; j < list[i].children.length; j++) {
+              exportList.push(list[i].children[j])
+            }
+          } else {
+            exportList.push(list[i])
           }
-        } else {
-          exportList.push(list[i])
         }
-      }
-      this.exportList = exportList
-    },
-    goDetail(id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.Detail.init(id)
-      })
-    },
-    sortChange({ column, prop, order }) {
-      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-      this.listQuery.sidx = !order ? '' : prop
-      this.initData()
-    },
-    async initSearchDataAndListData() {
-      await this.initSearchData()
-      this.initData()
-    },
-    //初始化查询的默认数据
-    async initSearchData() {
-    },
-    initData() {
-      this.listLoading = true;
-      let _query = {
-        ...this.listQuery,
-        ...this.query,
-        keyword: this.keyword,
-        dataType: 0,
-        menuId: this.menuId,
-        moduleId: '529993401664295493',
-        type: 1,
-      };
-      request({
-        url: `/api/scm/WarehousingInventory/getList`,
-        method: 'post',
-        data: _query
-      }).then(res => {
-        var _list = res.data.list;
-        this.list = _list.map(o => ({
-          ...o,
-          ...this.expandObj,
-        }))
-        this.total = res.data.pagination.total
-        this.listLoading = false
-      })
-    },
-    handleDel(id) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
+        this.exportList = exportList
+      },
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      async initSearchDataAndListData() {
+        await this.initSearchData()
+        this.initData()
+      },
+      //初始化查询的默认数据
+      async initSearchData() {},
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          keyword: this.keyword,
+          dataType: 0,
+          menuId: this.menuId,
+          moduleId: '529993401664295493',
+          type: 1,
+        };
         request({
-          url: `/api/scm/WarehousingInventory/${id}`,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingInventory/getList`,
+          method: 'post',
+          data: _query
         }).then(res => {
+          var _list = res.data.list;
+          this.list = _list.map(o => ({
+            ...o,
+            ...this.expandObj,
+          }))
+          this.total = res.data.pagination.total
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingInventory/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handelUpload() {
+        this.uploadBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.UploadBox.init("", "scm/WarehousingInventory")
+        })
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
-          });
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingInventory/batchRemove`,
+            data: ids,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {})
+      },
+      openSuperQuery() {
+        this.superQueryVisible = true
+        this.$nextTick(() => {
+          this.$refs.SuperQuery.init()
         })
-      }).catch(() => {
-      });
-    },
-    handelUpload() {
-      this.uploadBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/WarehousingInventory")
-      })
-    },
-    handleSelectionChange(val) {
-      const res = val.map(item => item.id)
-      this.multipleSelection = res
-    },
-    handleBatchRemoveDel() {
-      if (!this.multipleSelection.length) {
-        this.$message({
-          type: 'error',
-          message: '请选择一条数据',
-          duration: 1500,
+      },
+      superQuery(queryJson) {
+        this.listQuery.superQueryJson = queryJson
+        this.listQuery.currentPage = 1
+        this.initData()
+      },
+      addOrUpdateHandle(row, flowState) {
+        if (!row) {
+          this.addHandle();
+        } else {
+          this.updateHandle(row, flowState)
+        }
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.exportList)
         })
-        return
-      }
-      const ids = this.multipleSelection
-      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-        type: 'warning'
-      }).then(() => {
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
         request({
-          url: `/api/scm/WarehousingInventory/batchRemove`,
-          data: ids,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingInventory/Actions/Export`,
+          method: 'post',
+          data: query
         }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery.currentPage = 1
+        this.listQuery.pageSize = 20
+        this.listQuery.sort = "desc"
+        this.listQuery.sidx = ""
+        this.initData()
+      },
+      //流程改造后相关调用方法
+      updateHandle(row, flowState) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId || this.flowList[0].id,
+          opType: flowState ? 0 : '-1',
+          status: flowState
+        }
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      toApprovalDetail(row) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId,
+          opType: 0,
+          status: row.currentState
+        }
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      addHandle() {
+        if (!this.flowList.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
+            type: 'error',
+            message: '流程不存在'
           });
+        } else if (this.flowList.length === 1) {
+          this.selectFlow(this.flowList[0])
+        } else {
+          this.flowListVisible = true
+        }
+      },
+      //选择流程发起
+      selectFlow(item) {
+        let data = {
+          id: '',
+          formType: 1,
+          flowId: item.id,
+          opType: '-1'
+        }
+        this.flowListVisible = false
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
         })
-      }).catch(() => {
-      })
-    },
-    openSuperQuery() {
-      this.superQueryVisible = true
-      this.$nextTick(() => {
-        this.$refs.SuperQuery.init()
-      })
-    },
-    superQuery(queryJson) {
-      this.listQuery.superQueryJson = queryJson
-      this.listQuery.currentPage = 1
-      this.initData()
-    },
-    addOrUpdateHandle(row, flowState) {
-      if (!row) {
-        this.addHandle();
-      } else {
-        this.updateHandle(row, flowState)
-      }
-    },
-    exportData() {
-      this.exportBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.exportList)
-      })
-    },
-    download(data) {
-      let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-      request({
-        url: `/api/scm/WarehousingInventory/Actions/Export`,
-        method: 'post',
-        data: query
-      }).then(res => {
-        if (!res.data.url) return
-        this.jnpf.downloadFile(res.data.url)
-        this.$refs.ExportBox.visible = false
-        this.exportBoxVisible = false
-      })
-    },
-    search() {
-      this.listQuery.currentPage = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.sort = "desc"
-      this.listQuery.sidx = ""
-      this.initData()
-    },
-    //流程改造后相关调用方法
-    updateHandle(row, flowState) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId || this.flowList[0].id,
-        opType: flowState ? 0 : '-1',
-        status: flowState
-      }
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    toApprovalDetail(row) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId,
-        opType: 0,
-        status: row.currentState
-      }
-      this.formVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    addHandle() {
-      if (!this.flowList.length) {
-        this.$message({ type: 'error', message: '流程不存在' });
-      } else if (this.flowList.length === 1) {
-        this.selectFlow(this.flowList[0])
-      } else {
-        this.flowListVisible = true
-      }
-    },
-    //选择流程发起
-    selectFlow(item) {
-      let data = {
-        id: '',
-        formType: 1,
-        flowId: item.id,
-        opType: '-1'
-      }
-      this.flowListVisible = false
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    refresh(isrRefresh) {
-      this.formVisible = false
-      if (isrRefresh) this.reset()
-    },
-    reset() {
-      this.query = JSON.parse(JSON.stringify(this.queryData))
-      this.search()
-    },
-    colseFlow(isrRefresh) {
-      this.flowVisible = false
-      if (isrRefresh) this.reset()
-    },
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        this.query = JSON.parse(JSON.stringify(this.queryData))
+        this.search()
+      },
+      colseFlow(isrRefresh) {
+        this.flowVisible = false
+        if (isrRefresh) this.reset()
+      },
+    }
   }
-}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
index 3b03bc59..8f016370 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('documentNo')">
             <jnpf-form-tip-item label="单据编号" v-if="judgeShow('documentNo')" prop="documentNo">
@@ -73,20 +73,17 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="附件" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">出库凭证</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
-              <div class="JNPF-common-title">
-                <h2>出库凭证</h2>
-              </div>
-              <el-table :data="dataForm.warehousingOutboundPoundlistList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
+              <el-table :data="dataForm.warehousingOutboundPoundlistList" size='mini' border>
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                 <el-table-column label="关联凭证" min-width="150px"
-                  v-if="judgeShow('warehousingoutboundpoundlist-voucherId')" prop="voucherId">
+                  v-if="judgeShow('warehousingoutboundpoundlist-voucherId')" prop="voucherId" align="center" width="220" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundpoundlistList-voucherId')">*</span>关联凭证
@@ -104,7 +101,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="单据类型" prop="documentTypes">
+                <el-table-column label="单据类型" prop="documentTypes" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>单据类型
                   </template>
@@ -115,7 +112,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="凭证类型" prop="voucherType">
+                <el-table-column label="凭证类型" prop="voucherType" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>凭证类型
                   </template>
@@ -126,7 +123,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单编号" prop="poundCode">
+                <el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>磅单编号
                   </template>
@@ -137,7 +134,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单时间" prop="poundlistTime">
+                <el-table-column label="磅单时间" prop="poundlistTime" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>磅单时间
                   </template>
@@ -148,7 +145,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="车辆信息" prop="vehicleNumber">
+                <el-table-column label="车辆信息" prop="vehicleNumber" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>车辆信息
                   </template>
@@ -158,7 +155,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="商品名称" prop="productName">
+                <el-table-column label="商品名称" prop="productName" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>商品名称
                   </template>
@@ -169,7 +166,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" prop="productSpec">
+                <el-table-column label="规格" prop="productSpec" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>规格
                   </template>
@@ -179,7 +176,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="单位" prop="unit">
+                <el-table-column label="单位" prop="unit" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>单位
                   </template>
@@ -189,7 +186,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="毛重" prop="grossWeight">
+                <el-table-column label="毛重" prop="grossWeight" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>毛重
                   </template>
@@ -199,7 +196,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重" prop="tareWeight">
+                <el-table-column label="皮重" prop="tareWeight" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>皮重
                   </template>
@@ -209,7 +206,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="扣重" prop="buckleWeight">
+                <el-table-column label="扣重" prop="buckleWeight" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>扣重
                   </template>
@@ -219,7 +216,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重" prop="netWeight">
+                <el-table-column label="净重" prop="netWeight" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>净重
                   </template>
@@ -230,7 +227,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="备注" prop="remark">
+                <el-table-column label="备注" prop="remark" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>备注
                   </template>
@@ -241,7 +238,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingoutboundpoundlistList')">
+                <el-table-column label="操作" width="50" align="center" fixed="right" v-if="!judgeWrite('warehousingoutboundpoundlistList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousingoutboundpoundlistList(scope.$index)">删除</el-button>
@@ -255,18 +252,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
-          </el-col>
-          <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfText
-                :textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
-                content="默认展示关联单据的商品信息，可直接修改商品数量。">
-              </JnpfText>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('warehousingoutboundpoundlist-voucher_code')">
             <jnpf-form-tip-item label-width="0">
@@ -274,8 +263,8 @@
                 <h2></h2>
               </div>
               <el-table :data="dataForm.warehousingOutboundProductList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('warehousingoutboundproduct-productId')" prop="productId">
+                <el-table-column type="index" width="50" fixed="left" label="序号" align="center" />
+                <el-table-column label="商品名称" v-if="judgeShow('warehousingoutboundproduct-productId')" prop="productId" width="200" fixed="left" align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-productId')">*</span>商品名称
@@ -304,7 +293,7 @@
                   </template>
                 </el-table-column> -->
 
-                <el-table-column label="规格" prop="spec">
+                <el-table-column label="规格" prop="spec" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"></span>规格
                   </template>
@@ -315,7 +304,7 @@
                 </el-table-column>
 
                 <el-table-column label="出库单位" v-if="judgeShow('warehousingoutboundproduct-outboundUnit')"
-                  prop="outboundUnit">
+                  prop="outboundUnit" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-outboundUnit')">*</span>出库单位
@@ -334,7 +323,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" prop="spec">
+                <el-table-column label="规格" prop="spec" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"></span>规格
                   </template>
@@ -345,7 +334,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="库存单位" prop="inventoryUnitIds">
+                <el-table-column label="库存单位" prop="inventoryUnitIds" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"></span>库存单位
                   </template>
@@ -356,7 +345,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="入库单位规格" prop="111">
+                <el-table-column label="入库单位规格" prop="111" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"></span>入库单位规格
                   </template>
@@ -368,7 +357,7 @@
                 </el-table-column>
 
                 <el-table-column label="出库货区" v-if="judgeShow('warehousingoutboundproduct-outboundAreaId')"
-                  prop="outboundAreaId">
+                  prop="outboundAreaId" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-outboundAreaId')">*</span>出库货区
@@ -387,7 +376,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="出库数量" v-if="judgeShow('warehousingoutboundproduct-outboundNumber')"
-                  prop="outboundNumber">
+                  prop="outboundNumber" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-outboundNumber')">*</span>出库数量
@@ -401,7 +390,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="批次号" v-if="judgeShow('warehousingoutboundproduct-batchNumber')"
-                  prop="batchNumber">
+                  prop="batchNumber" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-batchNumber')">*</span>批次号
@@ -422,7 +411,7 @@
                 </el-table-column>
 
                 <el-table-column label="生产日期" v-if="judgeShow('warehousingoutboundproduct-dateManufacture')"
-                  prop="dateManufacture">
+                  prop="dateManufacture" width="200" align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingoutboundproductList-dateManufacture')">*</span>生产日期
@@ -437,7 +426,7 @@
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingoutboundproductList')">
+                <el-table-column label="操作" width="50" align="center" fixed="right" v-if="!judgeWrite('warehousingoutboundproductList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousingoutboundproductList(scope.$index)">删除</el-button>
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 bcedab29..400b0181 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
@@ -83,35 +83,35 @@
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="documentNo" label="单据编号" align="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="documentNo" label="单据编号" align="center" sortable width="200" fixed="left">
           </el-table-column>
-          <el-table-column label="业务类型" prop="warehousingStorageType" algin="left">
+          <el-table-column label="业务类型" prop="warehousingStorageType" align="center">
             <template slot-scope="scope">
               {{ scope.row.warehousingStorageType}}
             </template>
           </el-table-column>
-          <el-table-column prop="warehousingId" label="关联出库通知单号" align="left">
+          <el-table-column prop="warehousingId" label="关联出库通知单号" align="center" width="200">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="出库仓库" align="left">
+          <el-table-column prop="warehouseId" label="出库仓库" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="salesNo" label="关联销售单号" align="left">
+          <el-table-column prop="salesNo" label="关联销售单号" align="center" width="200">
           </el-table-column>
 
-          <el-table-column prop="receivedQuantity" label="实际出库数量" align="left">
+          <el-table-column prop="receivedQuantity" label="实际出库数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建人" align="left">
+          <el-table-column prop="creatorUserId" label="创建人" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="更新时间" align="left">
+          <el-table-column prop="lastModifyTime" label="更新时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="更新人" align="left">
+          <el-table-column prop="lastModifyUserId" label="更新人" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" width="150" align="center">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@@ -121,7 +121,7 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" align="center" fixed="right" width="150">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue
index 4b3bab19..d95d8192 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('receiveCode')">
             <jnpf-form-tip-item label="领用单编号" v-if="judgeShow('receiveCode')" prop="receiveCode">
@@ -64,29 +64,20 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-
-          <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
-          </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfText
-                :textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
-                content="默认展示关联单据的商品信息，可直接修改商品数量。">
-              </JnpfText>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.warehousingReceiveProductList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('warehousingreceiveproduct-productId')" prop="productId">
+              <el-table :data="dataForm.warehousingReceiveProductList" size='mini' border>
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                <el-table-column label="商品名称" v-if="judgeShow('warehousingreceiveproduct-productId')" prop="productId" align="center" width="220" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingreceiveproductList-productId')">*</span>商品名称
@@ -105,7 +96,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="领用单位" v-if="judgeShow('warehousingreceiveproduct-usedreturnUnit')"
-                  prop="usedreturnUnit">
+                  prop="usedreturnUnit" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -127,7 +118,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" v-if="judgeShow('warehousingreceiveproduct-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('warehousingreceiveproduct-spec')" prop="spec" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign" v-if="judgeRequired('warehousingreceiveproductList-spec')">*</span>规格
@@ -143,7 +134,7 @@
                 </el-table-column>
 
                 <el-table-column label="库存单位" v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -160,7 +151,7 @@
                 </el-table-column>
 
                 <el-table-column label="实物库存" v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -177,7 +168,7 @@
                 </el-table-column>
 
                 <el-table-column label="可用库存" v-if="judgeShow('warehousingreceiveproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -194,7 +185,7 @@
                 </el-table-column>
 
                 <el-table-column label="领用数量" v-if="judgeShow('warehousingreceiveproduct-usedreturnNumber')"
-                  prop="usedreturnNumber">
+                  prop="usedreturnNumber" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -210,7 +201,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="批次号" v-if="judgeShow('warehousingreceiveproduct-batchNumber')"
-                  prop="batchNumber">
+                  prop="batchNumber" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -226,7 +217,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="货区名称" v-if="judgeShow('warehousingreceiveproduct-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('warehousingreceiveproduct-cargoId')" prop="cargoId" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -246,7 +237,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingreceiveproductList')">
+                <el-table-column label="操作" width="50" align="center" fixed="right" v-if="!judgeWrite('warehousingreceiveproductList')">
 
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue
index 63781bc6..b50d6fbb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -17,8 +10,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="领用时间">
-              <JnpfDateRangePicker v-model="query.usedreturnTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.usedreturnTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -32,8 +25,8 @@
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
-                  startPlaceholder="开始日期" endPlaceholder="结束日期" />
+                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                  endPlaceholder="结束日期" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -52,8 +45,7 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -66,11 +58,9 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
-              v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -82,36 +72,35 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="receiveCode" label="领用单编号" align="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="receiveCode" label="领用单编号" align="center" sortable width="200" fixed="left">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="仓库名称" align="left">
+          <el-table-column prop="warehouseId" label="仓库名称" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="usedreturnTime" label="领用时间" align="left">
+          <el-table-column prop="usedreturnTime" label="领用时间" align="center" width="150">
           </el-table-column>
-          <el-table-column label="领用原因" prop="usedreturnReason" algin="left">
+          <el-table-column label="领用原因" prop="usedreturnReason" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.usedreturnReason}}
             </template>
           </el-table-column>
-          <el-table-column prop="businessId" label="关联单据" align="left">
+          <el-table-column prop="businessId" label="关联单据" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建用户" align="left">
+          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@@ -121,504 +110,560 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" align="center" width="150">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn"
-                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
-                @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
+                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize" @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
-      lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id"
-          @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-      @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-      @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
+  import request from '@/utils/request'
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import {
+    getFormById
+  } from '@/api/workFlow/FormDesign'
+  import {
+    getFlowList
+  } from '@/api/workFlow/FlowEngine'
+  import FlowBox from '@/views/workFlow/components/FlowBox'
+  import ExportBox from '@/components/ExportBox'
+  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import {
+    getConfigData
+  } from '@/api/onlineDev/visualDev'
+  import {
+    getDefaultCurrentValueUserIdAsync
+  } from '@/api/permission/user'
+  import {
+    getDefaultCurrentValueDepartmentIdAsync
+  } from '@/api/permission/organize'
+  import columnList from './columnList'
+  import {
+    thousandsFormat
+  } from "@/components/Generator/utils/index"
+  import SuperQuery from '@/components/SuperQuery'
+  import superQueryJson from './superQueryJson'
 
-import request from '@/utils/request'
-import { mapGetters } from "vuex";
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import { getFormById } from '@/api/workFlow/FormDesign'
-import { getFlowList } from '@/api/workFlow/FlowEngine'
-import FlowBox from '@/views/workFlow/components/FlowBox'
-import ExportBox from '@/components/ExportBox'
-import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-import { getConfigData } from '@/api/onlineDev/visualDev'
-import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-import columnList from './columnList'
-import { thousandsFormat } from "@/components/Generator/utils/index"
-import SuperQuery from '@/components/SuperQuery'
-import superQueryJson from './superQueryJson'
-
-export default {
-  components: {
-    FlowBox,
-    ExportBox, ToFormDetail, SuperQuery
-  },
-  data() {
-    return {
+  export default {
+    components: {
+      FlowBox,
+      ExportBox,
+      ToFormDetail,
+      SuperQuery
+    },
+    data() {
+      return {
 
-      keyword: '',
-      expandsTree: true,
-      refreshTree: true,
-      toFormDetailVisible: false,
-      expandObj: {},
-      columnOptions: [],
-      mergeList: [],
-      exportList: [],
-      columnList,
+        keyword: '',
+        expandsTree: true,
+        refreshTree: true,
+        toFormDetailVisible: false,
+        expandObj: {},
+        columnOptions: [],
+        mergeList: [],
+        exportList: [],
+        columnList,
 
-      showAll: false,
-      superQueryVisible: false,
-      superQueryJson,
-      uploadBoxVisible: false,
-      detailVisible: false,
-      query: {
-        receiveCode: undefined,
-        usedreturnTime: undefined,
-        usedreturnReason: undefined,
-        creatorTime: undefined,
-        creatorUserId: undefined,
-        tableField116_batchNumber: undefined,
-      },
-      treeProps: {
-        children: 'children',
-        label: 'fullName',
-        value: 'id',
-        isLeaf: 'isLeaf'
-      },
-      list: [],
-      listLoading: true,
-      multipleSelection: [], total: 0,
-      queryData: {},
-      listQuery: {
-        superQueryJson: '',
-        currentPage: 1,
-        pageSize: 20,
-        sort: "desc",
-        sidx: "",
-      },
-      formVisible: false,
-      flowVisible: false,
-      flowListVisible: false,
-      flowList: [],
-      exportBoxVisible: false,
-      usedreturnReasonOptions: [{ "fullName": "质量问题", "id": "1" }, { "fullName": "客户退回", "id": "2" }, { "fullName": "试用", "id": "3" }, { "fullName": "临期报废", "id": "4" }, { "fullName": "维修", "id": "5" }, { "fullName": "保养", "id": "6" }, { "fullName": "作业工具", "id": "7" }, { "fullName": "其他", "id": "8" }],
-      usedreturnReasonProps: { "label": "fullName", "value": "id" },
-      //   tableField116_productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" }, { "label": "批次号", "value": "batchNumber" },],
-      //   tableField116_usedreturnUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
-      interfaceRes: {
-        warehouseId: [],
-        businessId: [],
-        tableField116_productId: [],
-        tableField116_usedreturnUnit: [],
-      },
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    menuId() {
-      return this.$route.meta.modelId || ''
-    }
-  },
-  created() {
-    getFormById("530406729209370373").then(res1 => {
-      let flowId = res1.data && res1.data.id
-      getFlowList(flowId, '1').then(res2 => {
-        this.flowList = res2.data
-        this.getColumnList(),
-          this.initSearchDataAndListData()
-        this.queryData = JSON.parse(JSON.stringify(this.query))
-      }).catch((e) => {
-        this.$message({ type: 'error', message: e.message });
-        this.$router.push('/404');
-      })
-    })
-  },
-  methods: {
-    toDetail(defaultValue, modelId) {
-      if (!defaultValue) return
-      getConfigData(modelId).then(res => {
-        if (!res.data || !res.data.formData) return
-        let formData = JSON.parse(res.data.formData)
-        formData.popupType = 'general'
-        this.toFormDetailVisible = true
-        this.$nextTick(() => {
-          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+        showAll: false,
+        superQueryVisible: false,
+        superQueryJson,
+        uploadBoxVisible: false,
+        detailVisible: false,
+        query: {
+          receiveCode: undefined,
+          usedreturnTime: undefined,
+          usedreturnReason: undefined,
+          creatorTime: undefined,
+          creatorUserId: undefined,
+          tableField116_batchNumber: undefined,
+        },
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id',
+          isLeaf: 'isLeaf'
+        },
+        list: [],
+        listLoading: true,
+        multipleSelection: [],
+        total: 0,
+        queryData: {},
+        listQuery: {
+          superQueryJson: '',
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        },
+        formVisible: false,
+        flowVisible: false,
+        flowListVisible: false,
+        flowList: [],
+        exportBoxVisible: false,
+        usedreturnReasonOptions: [{
+          "fullName": "质量问题",
+          "id": "1"
+        }, {
+          "fullName": "客户退回",
+          "id": "2"
+        }, {
+          "fullName": "试用",
+          "id": "3"
+        }, {
+          "fullName": "临期报废",
+          "id": "4"
+        }, {
+          "fullName": "维修",
+          "id": "5"
+        }, {
+          "fullName": "保养",
+          "id": "6"
+        }, {
+          "fullName": "作业工具",
+          "id": "7"
+        }, {
+          "fullName": "其他",
+          "id": "8"
+        }],
+        usedreturnReasonProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        //   tableField116_productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" }, { "label": "批次号", "value": "batchNumber" },],
+        //   tableField116_usedreturnUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
+        interfaceRes: {
+          warehouseId: [],
+          businessId: [],
+          tableField116_productId: [],
+          tableField116_usedreturnUnit: [],
+        },
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      getFormById("530406729209370373").then(res1 => {
+        let flowId = res1.data && res1.data.id
+        getFlowList(flowId, '1').then(res2 => {
+          this.flowList = res2.data
+          this.getColumnList(),
+            this.initSearchDataAndListData()
+          this.queryData = JSON.parse(JSON.stringify(this.query))
+        }).catch((e) => {
+          this.$message({
+            type: 'error',
+            message: e.message
+          });
+          this.$router.push('/404');
         })
       })
     },
-    toggleTreeExpand(expands) {
-      this.refreshTree = false
-      this.expandsTree = expands
-      this.$nextTick(() => {
-        this.refreshTree = true
+    methods: {
+      toDetail(defaultValue, modelId) {
+        if (!defaultValue) return
+        getConfigData(modelId).then(res => {
+          if (!res.data || !res.data.formData) return
+          let formData = JSON.parse(res.data.formData)
+          formData.popupType = 'general'
+          this.toFormDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+          })
+        })
+      },
+      toggleTreeExpand(expands) {
+        this.refreshTree = false
+        this.expandsTree = expands
         this.$nextTick(() => {
-          this.$refs.treeBox.setCurrentKey(null)
+          this.refreshTree = true
+          this.$nextTick(() => {
+            this.$refs.treeBox.setCurrentKey(null)
+          })
         })
-      })
-    },
-    filterNode(value, data) {
-      if (!value) return true;
-      return data[this.treeProps.label].indexOf(value) !== -1;
-    },
-    loadNode(node, resolve) {
-      const nodeData = node.data
-      const config = {
-        treeInterfaceId: "",
-        treeTemplateJson: []
-      }
-      if (config.treeInterfaceId) {
-        //这里是为了拿到参数中关联的字段的值，后端自行拿
-        if (config.treeTemplateJson && config.treeTemplateJson.length) {
-          for (let i = 0; i < config.treeTemplateJson.length; i++) {
-            const element = config.treeTemplateJson[i];
-            element.defaultValue = nodeData[element.relationField] || ''
-          }
-        }
-        //参数
-        let query = {
-          paramList: config.treeTemplateJson || [],
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data[this.treeProps.label].indexOf(value) !== -1;
+      },
+      loadNode(node, resolve) {
+        const nodeData = node.data
+        const config = {
+          treeInterfaceId: "",
+          treeTemplateJson: []
         }
-        //接口
-        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-          let data = res.data
-          if (Array.isArray(data)) {
-            resolve(data);
-          } else {
-            resolve([]);
+        if (config.treeInterfaceId) {
+          //这里是为了拿到参数中关联的字段的值，后端自行拿
+          if (config.treeTemplateJson && config.treeTemplateJson.length) {
+            for (let i = 0; i < config.treeTemplateJson.length; i++) {
+              const element = config.treeTemplateJson[i];
+              element.defaultValue = nodeData[element.relationField] || ''
+            }
           }
-        })
-      }
-    },
-    getColumnList() {
-      // 没有开启权限
-      this.columnOptions = this.transformColumnList(this.columnList)
-    },
-    transformColumnList(columnList) {
-      let list = []
-      for (let i = 0; i < columnList.length; i++) {
-        const e = columnList[i];
-        if (!e.prop.includes('-')) {
-          list.push(e)
-        } else {
-          let prop = e.prop.split('-')[0]
-          let label = e.label.split('-')[0]
-          let vModel = e.prop.split('-')[1]
-          let newItem = {
-            align: "center",
-            jnpfKey: "table",
-            prop,
-            label,
-            children: []
+          //参数
+          let query = {
+            paramList: config.treeTemplateJson || [],
           }
-          e.vModel = vModel
-          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-          if (!list.some(o => o.prop === prop)) list.push(newItem)
-          for (let i = 0; i < list.length; i++) {
-            if (list[i].prop === prop) {
-              list[i].children.push(e)
-              break
+          //接口
+          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+            let data = res.data
+            if (Array.isArray(data)) {
+              resolve(data);
+            } else {
+              resolve([]);
             }
-          }
+          })
         }
-      }
-      this.getMergeList(list)
-      this.getExportList(list)
-      return list
-    },
-    arraySpanMethod({ column }) {
-      for (let i = 0; i < this.mergeList.length; i++) {
-        if (column.property == this.mergeList[i].prop) {
-          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+      },
+      getColumnList() {
+        // 没有开启权限
+        this.columnOptions = this.transformColumnList(this.columnList)
+      },
+      transformColumnList(columnList) {
+        let list = []
+        for (let i = 0; i < columnList.length; i++) {
+          const e = columnList[i];
+          if (!e.prop.includes('-')) {
+            list.push(e)
+          } else {
+            let prop = e.prop.split('-')[0]
+            let label = e.label.split('-')[0]
+            let vModel = e.prop.split('-')[1]
+            let newItem = {
+              align: "center",
+              jnpfKey: "table",
+              prop,
+              label,
+              children: []
+            }
+            e.vModel = vModel
+            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+            if (!list.some(o => o.prop === prop)) list.push(newItem)
+            for (let i = 0; i < list.length; i++) {
+              if (list[i].prop === prop) {
+                list[i].children.push(e)
+                break
+              }
+            }
+          }
         }
-      }
-    },
-    getMergeList(list) {
-      let newList = JSON.parse(JSON.stringify(list))
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          let child = {
-            prop: item.prop + '-child-first'
+        this.getMergeList(list)
+        this.getExportList(list)
+        return list
+      },
+      arraySpanMethod({
+        column
+      }) {
+        for (let i = 0; i < this.mergeList.length; i++) {
+          if (column.property == this.mergeList[i].prop) {
+            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
           }
-          item.children.unshift(child)
         }
-      })
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          item.children.forEach((child, index) => {
-            if (index == 0) {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 1,
-                colspan: item.children.length
-              })
-            } else {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 0,
-                colspan: 0
-              })
+      },
+      getMergeList(list) {
+        let newList = JSON.parse(JSON.stringify(list))
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            let child = {
+              prop: item.prop + '-child-first'
             }
-          })
-        } else {
-          this.mergeList.push({
-            prop: item.prop,
-            rowspan: 1,
-            colspan: 1
-          })
-        }
-      })
-    },
-    getExportList(list) {
-      let exportList = []
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].jnpfKey === 'table') {
-          for (let j = 0; j < list[i].children.length; j++) {
-            exportList.push(list[i].children[j])
+            item.children.unshift(child)
+          }
+        })
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            item.children.forEach((child, index) => {
+              if (index == 0) {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 1,
+                  colspan: item.children.length
+                })
+              } else {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 0,
+                  colspan: 0
+                })
+              }
+            })
+          } else {
+            this.mergeList.push({
+              prop: item.prop,
+              rowspan: 1,
+              colspan: 1
+            })
+          }
+        })
+      },
+      getExportList(list) {
+        let exportList = []
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].jnpfKey === 'table') {
+            for (let j = 0; j < list[i].children.length; j++) {
+              exportList.push(list[i].children[j])
+            }
+          } else {
+            exportList.push(list[i])
           }
-        } else {
-          exportList.push(list[i])
         }
-      }
-      this.exportList = exportList
-    },
-    goDetail(id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.Detail.init(id)
-      })
-    },
-    sortChange({ column, prop, order }) {
-      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-      this.listQuery.sidx = !order ? '' : prop
-      this.initData()
-    },
-    async initSearchDataAndListData() {
-      await this.initSearchData()
-      this.initData()
-    },
-    //初始化查询的默认数据
-    async initSearchData() {
-    },
-    initData() {
-      this.listLoading = true;
-      let _query = {
-        ...this.listQuery,
-        ...this.query,
-        keyword: this.keyword,
-        dataType: 0,
-        menuId: this.menuId,
-        moduleId: '530406729209370373',
-        type: 1,
-      };
-      request({
-        url: `/api/scm/WarehousingReceive/getList`,
-        method: 'post',
-        data: _query
-      }).then(res => {
-        var _list = res.data.list;
-        this.list = _list.map(o => ({
-          ...o,
-          ...this.expandObj,
-        }))
-        this.total = res.data.pagination.total
-        this.listLoading = false
-      })
-    },
-    handleDel(id) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
+        this.exportList = exportList
+      },
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      async initSearchDataAndListData() {
+        await this.initSearchData()
+        this.initData()
+      },
+      //初始化查询的默认数据
+      async initSearchData() {},
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          keyword: this.keyword,
+          dataType: 0,
+          menuId: this.menuId,
+          moduleId: '530406729209370373',
+          type: 1,
+        };
         request({
-          url: `/api/scm/WarehousingReceive/${id}`,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingReceive/getList`,
+          method: 'post',
+          data: _query
         }).then(res => {
+          var _list = res.data.list;
+          this.list = _list.map(o => ({
+            ...o,
+            ...this.expandObj,
+          }))
+          this.total = res.data.pagination.total
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingReceive/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handelUpload() {
+        this.uploadBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.UploadBox.init("", "scm/WarehousingReceive")
+        })
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
-          });
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingReceive/batchRemove`,
+            data: ids,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {})
+      },
+      openSuperQuery() {
+        this.superQueryVisible = true
+        this.$nextTick(() => {
+          this.$refs.SuperQuery.init()
         })
-      }).catch(() => {
-      });
-    },
-    handelUpload() {
-      this.uploadBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/WarehousingReceive")
-      })
-    },
-    handleSelectionChange(val) {
-      const res = val.map(item => item.id)
-      this.multipleSelection = res
-    },
-    handleBatchRemoveDel() {
-      if (!this.multipleSelection.length) {
-        this.$message({
-          type: 'error',
-          message: '请选择一条数据',
-          duration: 1500,
+      },
+      superQuery(queryJson) {
+        this.listQuery.superQueryJson = queryJson
+        this.listQuery.currentPage = 1
+        this.initData()
+      },
+      addOrUpdateHandle(row, flowState) {
+        if (!row) {
+          this.addHandle();
+        } else {
+          this.updateHandle(row, flowState)
+        }
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.exportList)
         })
-        return
-      }
-      const ids = this.multipleSelection
-      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-        type: 'warning'
-      }).then(() => {
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
         request({
-          url: `/api/scm/WarehousingReceive/batchRemove`,
-          data: ids,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingReceive/Actions/Export`,
+          method: 'post',
+          data: query
         }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery.currentPage = 1
+        this.listQuery.pageSize = 20
+        this.listQuery.sort = "desc"
+        this.listQuery.sidx = ""
+        this.initData()
+      },
+      //流程改造后相关调用方法
+      updateHandle(row, flowState) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId || this.flowList[0].id,
+          opType: flowState ? 0 : '-1',
+          status: flowState
+        }
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      toApprovalDetail(row) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId,
+          opType: 0,
+          status: row.currentState
+        }
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      addHandle() {
+        if (!this.flowList.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
+            type: 'error',
+            message: '流程不存在'
           });
+        } else if (this.flowList.length === 1) {
+          this.selectFlow(this.flowList[0])
+        } else {
+          this.flowListVisible = true
+        }
+      },
+      //选择流程发起
+      selectFlow(item) {
+        let data = {
+          id: '',
+          formType: 1,
+          flowId: item.id,
+          opType: '-1'
+        }
+        this.flowListVisible = false
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
         })
-      }).catch(() => {
-      })
-    },
-    openSuperQuery() {
-      this.superQueryVisible = true
-      this.$nextTick(() => {
-        this.$refs.SuperQuery.init()
-      })
-    },
-    superQuery(queryJson) {
-      this.listQuery.superQueryJson = queryJson
-      this.listQuery.currentPage = 1
-      this.initData()
-    },
-    addOrUpdateHandle(row, flowState) {
-      if (!row) {
-        this.addHandle();
-      } else {
-        this.updateHandle(row, flowState)
-      }
-    },
-    exportData() {
-      this.exportBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.exportList)
-      })
-    },
-    download(data) {
-      let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-      request({
-        url: `/api/scm/WarehousingReceive/Actions/Export`,
-        method: 'post',
-        data: query
-      }).then(res => {
-        if (!res.data.url) return
-        this.jnpf.downloadFile(res.data.url)
-        this.$refs.ExportBox.visible = false
-        this.exportBoxVisible = false
-      })
-    },
-    search() {
-      this.listQuery.currentPage = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.sort = "desc"
-      this.listQuery.sidx = ""
-      this.initData()
-    },
-    //流程改造后相关调用方法
-    updateHandle(row, flowState) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId || this.flowList[0].id,
-        opType: flowState ? 0 : '-1',
-        status: flowState
-      }
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    toApprovalDetail(row) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId,
-        opType: 0,
-        status: row.currentState
-      }
-      this.formVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    addHandle() {
-      if (!this.flowList.length) {
-        this.$message({ type: 'error', message: '流程不存在' });
-      } else if (this.flowList.length === 1) {
-        this.selectFlow(this.flowList[0])
-      } else {
-        this.flowListVisible = true
-      }
-    },
-    //选择流程发起
-    selectFlow(item) {
-      let data = {
-        id: '',
-        formType: 1,
-        flowId: item.id,
-        opType: '-1'
-      }
-      this.flowListVisible = false
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    refresh(isrRefresh) {
-      this.formVisible = false
-      if (isrRefresh) this.reset()
-    },
-    reset() {
-      this.query = JSON.parse(JSON.stringify(this.queryData))
-      this.search()
-    },
-    colseFlow(isrRefresh) {
-      this.flowVisible = false
-      if (isrRefresh) this.reset()
-    },
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        this.query = JSON.parse(JSON.stringify(this.queryData))
+        this.search()
+      },
+      colseFlow(isrRefresh) {
+        this.flowVisible = false
+        if (isrRefresh) this.reset()
+      },
+    }
   }
-}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue
index c283aba2..5456c56a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('reportlossCode')">
             <jnpf-form-tip-item label="报损单编号" v-if="judgeShow('reportlossCode')" prop="reportlossCode">
@@ -62,20 +62,20 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.warehousingReportlossProductList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
+              <el-table :data="dataForm.warehousingReportlossProductList" size='mini' border>
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                 <el-table-column label="商品名称" v-if="judgeShow('warehousingreportlossproduct-productId')"
-                  prop="productId">
+                  prop="productId" align="center" width="220" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingreportlossproductList-productId')">*</span>商品名称
@@ -94,7 +94,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="报损单位" v-if="judgeShow('warehousingreportlossproduct-reportlossUnit')"
-                  prop="reportlossUnit">
+                  prop="reportlossUnit" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -115,7 +115,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" v-if="judgeShow('warehousingreportlossproduct-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('warehousingreportlossproduct-spec')" prop="spec" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign" v-if="judgeRequired('warehousingreportlossproductList-spec')">*</span>规格
@@ -131,7 +131,7 @@
                 </el-table-column>
 
                 <el-table-column label="库存单位" v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -149,7 +149,7 @@
                 </el-table-column>
 
                 <el-table-column label="实物库存" v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -167,7 +167,7 @@
                 </el-table-column>
 
                 <el-table-column label="可用库存" v-if="judgeShow('warehousingreportlossproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -185,7 +185,7 @@
                 </el-table-column>
 
                 <el-table-column label="报损数量" v-if="judgeShow('warehousingreportlossproduct-reportlossNumber')"
-                  prop="reportlossNumber">
+                  prop="reportlossNumber" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -202,7 +202,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="货区名称" v-if="judgeShow('warehousingreportlossproduct-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('warehousingreportlossproduct-cargoId')" prop="cargoId" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -223,7 +223,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingreportlossproductList')">
+                <el-table-column label="操作" align="center" width="200" fixed="right" v-if="!judgeWrite('warehousingreportlossproductList')">
 
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue
index 654beacd..7e8fb3db 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -12,15 +5,15 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="报损时间">
-              <JnpfDateRangePicker v-model="query.reportlossTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.reportlossTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据类型">
-              <JnpfSelect v-model="query.reportlossType" placeholder="请选择" clearable
-                :options="reportlossTypeOptions" :props="reportlossTypeProps" multiple>
+              <JnpfSelect v-model="query.reportlossType" placeholder="请选择" clearable :options="reportlossTypeOptions"
+                :props="reportlossTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -40,11 +33,9 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
-              v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -56,43 +47,42 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="reportlossCode" label="报损单编号" align="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="reportlossCode" label="报损单编号" align="center" sortable width="200" fixed="left">
           </el-table-column>
-          <el-table-column label="单据类型" prop="reportlossType" algin="left">
+          <el-table-column label="单据类型" prop="reportlossType" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.reportlossType}}
             </template>
           </el-table-column>
-          <el-table-column prop="reportlossTime" label="报损时间" align="left">
+          <el-table-column prop="reportlossTime" label="报损时间" align="center" width="150">
           </el-table-column>
-          <el-table-column label="报损原因" prop="reportlossReason" algin="left">
+          <el-table-column label="报损原因" prop="reportlossReason" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.reportlossReason}}
             </template>
           </el-table-column>
-          <el-table-column prop="warehouseId" label="仓库名称" align="left">
+          <el-table-column prop="warehouseId" label="仓库名称" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="reportlossSum" label="报损总数量" align="left">
+          <el-table-column prop="reportlossSum" label="报损总数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorUserId" label="创建用户" align="left">
+          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@@ -102,501 +92,578 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" align="center" width="150">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn"
-                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
-                @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
+                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize" @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
-      lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id"
-          @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-      @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-      @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
+  import request from '@/utils/request'
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import {
+    getFormById
+  } from '@/api/workFlow/FormDesign'
+  import {
+    getFlowList
+  } from '@/api/workFlow/FlowEngine'
+  import FlowBox from '@/views/workFlow/components/FlowBox'
+  import ExportBox from '@/components/ExportBox'
+  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import {
+    getConfigData
+  } from '@/api/onlineDev/visualDev'
+  import {
+    getDefaultCurrentValueUserIdAsync
+  } from '@/api/permission/user'
+  import {
+    getDefaultCurrentValueDepartmentIdAsync
+  } from '@/api/permission/organize'
+  import columnList from './columnList'
+  import {
+    thousandsFormat
+  } from "@/components/Generator/utils/index"
+  import SuperQuery from '@/components/SuperQuery'
+  import superQueryJson from './superQueryJson'
 
-import request from '@/utils/request'
-import { mapGetters } from "vuex";
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import { getFormById } from '@/api/workFlow/FormDesign'
-import { getFlowList } from '@/api/workFlow/FlowEngine'
-import FlowBox from '@/views/workFlow/components/FlowBox'
-import ExportBox from '@/components/ExportBox'
-import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-import { getConfigData } from '@/api/onlineDev/visualDev'
-import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-import columnList from './columnList'
-import { thousandsFormat } from "@/components/Generator/utils/index"
-import SuperQuery from '@/components/SuperQuery'
-import superQueryJson from './superQueryJson'
-
-export default {
-  components: {
-    FlowBox,
-    ExportBox, ToFormDetail, SuperQuery
-  },
-  data() {
-    return {
+  export default {
+    components: {
+      FlowBox,
+      ExportBox,
+      ToFormDetail,
+      SuperQuery
+    },
+    data() {
+      return {
 
-      keyword: '',
-      expandsTree: true,
-      refreshTree: true,
-      toFormDetailVisible: false,
-      expandObj: {},
-      columnOptions: [],
-      mergeList: [],
-      exportList: [],
-      columnList,
+        keyword: '',
+        expandsTree: true,
+        refreshTree: true,
+        toFormDetailVisible: false,
+        expandObj: {},
+        columnOptions: [],
+        mergeList: [],
+        exportList: [],
+        columnList,
 
-      superQueryVisible: false,
-      superQueryJson,
-      uploadBoxVisible: false,
-      detailVisible: false,
-      query: {
-        reportlossTime: undefined,
-        reportlossType: undefined,
-        reportlossCode: undefined,
-      },
-      treeProps: {
-        children: 'children',
-        label: 'fullName',
-        value: 'id',
-        isLeaf: 'isLeaf'
-      },
-      list: [],
-      listLoading: true,
-      multipleSelection: [], total: 0,
-      queryData: {},
-      listQuery: {
-        superQueryJson: '',
-        currentPage: 1,
-        pageSize: 20,
-        sort: "desc",
-        sidx: "",
-      },
-      formVisible: false,
-      flowVisible: false,
-      flowListVisible: false,
-      flowList: [],
-      exportBoxVisible: false,
-      reportlossTypeOptions: [{ "fullName": "采购报损", "id": "1" }, { "fullName": "销售报损", "id": "2" }, { "fullName": "仓库报损", "id": "3" }, { "fullName": "加工报损", "id": "4" }, { "fullName": "其他报损", "id": "5" }],
-      reportlossTypeProps: { "label": "fullName", "value": "id" },
-      reportlossReasonOptions: [{ "fullName": "质量问题", "id": "1" }, { "fullName": "客户退回", "id": "2" }, { "fullName": "试用", "id": "3" }, { "fullName": "临期报废", "id": "4" }, { "fullName": "其他", "id": "5" }],
-      reportlossReasonProps: { "label": "fullName", "value": "id" },
-      tableField109_productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "批次号", "value": "batch_number" },],
-      tableField109_reportlossUnitcolumnOptions: [{ "label": "单位", "value": "unit_name" },],
-      interfaceRes: {
-        warehouseId: [],
-        tableField109_productId: [],
-        tableField109_reportlossUnit: [],
-      },
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    menuId() {
-      return this.$route.meta.modelId || ''
-    }
-  },
-  created() {
-    getFormById("530031733014287557").then(res1 => {
-      let flowId = res1.data && res1.data.id
-      getFlowList(flowId, '1').then(res2 => {
-        this.flowList = res2.data
-        this.getColumnList(),
-          this.initSearchDataAndListData()
-        this.queryData = JSON.parse(JSON.stringify(this.query))
-      }).catch((e) => {
-        this.$message({ type: 'error', message: e.message });
-        this.$router.push('/404');
-      })
-    })
-  },
-  methods: {
-    toDetail(defaultValue, modelId) {
-      if (!defaultValue) return
-      getConfigData(modelId).then(res => {
-        if (!res.data || !res.data.formData) return
-        let formData = JSON.parse(res.data.formData)
-        formData.popupType = 'general'
-        this.toFormDetailVisible = true
-        this.$nextTick(() => {
-          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+        superQueryVisible: false,
+        superQueryJson,
+        uploadBoxVisible: false,
+        detailVisible: false,
+        query: {
+          reportlossTime: undefined,
+          reportlossType: undefined,
+          reportlossCode: undefined,
+        },
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id',
+          isLeaf: 'isLeaf'
+        },
+        list: [],
+        listLoading: true,
+        multipleSelection: [],
+        total: 0,
+        queryData: {},
+        listQuery: {
+          superQueryJson: '',
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        },
+        formVisible: false,
+        flowVisible: false,
+        flowListVisible: false,
+        flowList: [],
+        exportBoxVisible: false,
+        reportlossTypeOptions: [{
+          "fullName": "采购报损",
+          "id": "1"
+        }, {
+          "fullName": "销售报损",
+          "id": "2"
+        }, {
+          "fullName": "仓库报损",
+          "id": "3"
+        }, {
+          "fullName": "加工报损",
+          "id": "4"
+        }, {
+          "fullName": "其他报损",
+          "id": "5"
+        }],
+        reportlossTypeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        reportlossReasonOptions: [{
+          "fullName": "质量问题",
+          "id": "1"
+        }, {
+          "fullName": "客户退回",
+          "id": "2"
+        }, {
+          "fullName": "试用",
+          "id": "3"
+        }, {
+          "fullName": "临期报废",
+          "id": "4"
+        }, {
+          "fullName": "其他",
+          "id": "5"
+        }],
+        reportlossReasonProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        tableField109_productIdcolumnOptions: [{
+          "label": "商品名称",
+          "value": "name"
+        }, {
+          "label": "商品编码",
+          "value": "code"
+        }, {
+          "label": "批次号",
+          "value": "batch_number"
+        }, ],
+        tableField109_reportlossUnitcolumnOptions: [{
+          "label": "单位",
+          "value": "unit_name"
+        }, ],
+        interfaceRes: {
+          warehouseId: [],
+          tableField109_productId: [],
+          tableField109_reportlossUnit: [],
+        },
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      getFormById("530031733014287557").then(res1 => {
+        let flowId = res1.data && res1.data.id
+        getFlowList(flowId, '1').then(res2 => {
+          this.flowList = res2.data
+          this.getColumnList(),
+            this.initSearchDataAndListData()
+          this.queryData = JSON.parse(JSON.stringify(this.query))
+        }).catch((e) => {
+          this.$message({
+            type: 'error',
+            message: e.message
+          });
+          this.$router.push('/404');
         })
       })
     },
-    toggleTreeExpand(expands) {
-      this.refreshTree = false
-      this.expandsTree = expands
-      this.$nextTick(() => {
-        this.refreshTree = true
+    methods: {
+      toDetail(defaultValue, modelId) {
+        if (!defaultValue) return
+        getConfigData(modelId).then(res => {
+          if (!res.data || !res.data.formData) return
+          let formData = JSON.parse(res.data.formData)
+          formData.popupType = 'general'
+          this.toFormDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+          })
+        })
+      },
+      toggleTreeExpand(expands) {
+        this.refreshTree = false
+        this.expandsTree = expands
         this.$nextTick(() => {
-          this.$refs.treeBox.setCurrentKey(null)
+          this.refreshTree = true
+          this.$nextTick(() => {
+            this.$refs.treeBox.setCurrentKey(null)
+          })
         })
-      })
-    },
-    filterNode(value, data) {
-      if (!value) return true;
-      return data[this.treeProps.label].indexOf(value) !== -1;
-    },
-    loadNode(node, resolve) {
-      const nodeData = node.data
-      const config = {
-        treeInterfaceId: "",
-        treeTemplateJson: []
-      }
-      if (config.treeInterfaceId) {
-        //这里是为了拿到参数中关联的字段的值，后端自行拿
-        if (config.treeTemplateJson && config.treeTemplateJson.length) {
-          for (let i = 0; i < config.treeTemplateJson.length; i++) {
-            const element = config.treeTemplateJson[i];
-            element.defaultValue = nodeData[element.relationField] || ''
-          }
-        }
-        //参数
-        let query = {
-          paramList: config.treeTemplateJson || [],
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data[this.treeProps.label].indexOf(value) !== -1;
+      },
+      loadNode(node, resolve) {
+        const nodeData = node.data
+        const config = {
+          treeInterfaceId: "",
+          treeTemplateJson: []
         }
-        //接口
-        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-          let data = res.data
-          if (Array.isArray(data)) {
-            resolve(data);
-          } else {
-            resolve([]);
+        if (config.treeInterfaceId) {
+          //这里是为了拿到参数中关联的字段的值，后端自行拿
+          if (config.treeTemplateJson && config.treeTemplateJson.length) {
+            for (let i = 0; i < config.treeTemplateJson.length; i++) {
+              const element = config.treeTemplateJson[i];
+              element.defaultValue = nodeData[element.relationField] || ''
+            }
           }
-        })
-      }
-    },
-    getColumnList() {
-      // 没有开启权限
-      this.columnOptions = this.transformColumnList(this.columnList)
-    },
-    transformColumnList(columnList) {
-      let list = []
-      for (let i = 0; i < columnList.length; i++) {
-        const e = columnList[i];
-        if (!e.prop.includes('-')) {
-          list.push(e)
-        } else {
-          let prop = e.prop.split('-')[0]
-          let label = e.label.split('-')[0]
-          let vModel = e.prop.split('-')[1]
-          let newItem = {
-            align: "center",
-            jnpfKey: "table",
-            prop,
-            label,
-            children: []
+          //参数
+          let query = {
+            paramList: config.treeTemplateJson || [],
           }
-          e.vModel = vModel
-          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-          if (!list.some(o => o.prop === prop)) list.push(newItem)
-          for (let i = 0; i < list.length; i++) {
-            if (list[i].prop === prop) {
-              list[i].children.push(e)
-              break
+          //接口
+          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+            let data = res.data
+            if (Array.isArray(data)) {
+              resolve(data);
+            } else {
+              resolve([]);
             }
-          }
+          })
         }
-      }
-      this.getMergeList(list)
-      this.getExportList(list)
-      return list
-    },
-    arraySpanMethod({ column }) {
-      for (let i = 0; i < this.mergeList.length; i++) {
-        if (column.property == this.mergeList[i].prop) {
-          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+      },
+      getColumnList() {
+        // 没有开启权限
+        this.columnOptions = this.transformColumnList(this.columnList)
+      },
+      transformColumnList(columnList) {
+        let list = []
+        for (let i = 0; i < columnList.length; i++) {
+          const e = columnList[i];
+          if (!e.prop.includes('-')) {
+            list.push(e)
+          } else {
+            let prop = e.prop.split('-')[0]
+            let label = e.label.split('-')[0]
+            let vModel = e.prop.split('-')[1]
+            let newItem = {
+              align: "center",
+              jnpfKey: "table",
+              prop,
+              label,
+              children: []
+            }
+            e.vModel = vModel
+            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+            if (!list.some(o => o.prop === prop)) list.push(newItem)
+            for (let i = 0; i < list.length; i++) {
+              if (list[i].prop === prop) {
+                list[i].children.push(e)
+                break
+              }
+            }
+          }
         }
-      }
-    },
-    getMergeList(list) {
-      let newList = JSON.parse(JSON.stringify(list))
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          let child = {
-            prop: item.prop + '-child-first'
+        this.getMergeList(list)
+        this.getExportList(list)
+        return list
+      },
+      arraySpanMethod({
+        column
+      }) {
+        for (let i = 0; i < this.mergeList.length; i++) {
+          if (column.property == this.mergeList[i].prop) {
+            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
           }
-          item.children.unshift(child)
         }
-      })
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          item.children.forEach((child, index) => {
-            if (index == 0) {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 1,
-                colspan: item.children.length
-              })
-            } else {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 0,
-                colspan: 0
-              })
+      },
+      getMergeList(list) {
+        let newList = JSON.parse(JSON.stringify(list))
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            let child = {
+              prop: item.prop + '-child-first'
             }
-          })
-        } else {
-          this.mergeList.push({
-            prop: item.prop,
-            rowspan: 1,
-            colspan: 1
-          })
-        }
-      })
-    },
-    getExportList(list) {
-      let exportList = []
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].jnpfKey === 'table') {
-          for (let j = 0; j < list[i].children.length; j++) {
-            exportList.push(list[i].children[j])
+            item.children.unshift(child)
+          }
+        })
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            item.children.forEach((child, index) => {
+              if (index == 0) {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 1,
+                  colspan: item.children.length
+                })
+              } else {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 0,
+                  colspan: 0
+                })
+              }
+            })
+          } else {
+            this.mergeList.push({
+              prop: item.prop,
+              rowspan: 1,
+              colspan: 1
+            })
+          }
+        })
+      },
+      getExportList(list) {
+        let exportList = []
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].jnpfKey === 'table') {
+            for (let j = 0; j < list[i].children.length; j++) {
+              exportList.push(list[i].children[j])
+            }
+          } else {
+            exportList.push(list[i])
           }
-        } else {
-          exportList.push(list[i])
         }
-      }
-      this.exportList = exportList
-    },
-    goDetail(id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.Detail.init(id)
-      })
-    },
-    sortChange({ column, prop, order }) {
-      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-      this.listQuery.sidx = !order ? '' : prop
-      this.initData()
-    },
-    async initSearchDataAndListData() {
-      await this.initSearchData()
-      this.initData()
-    },
-    //初始化查询的默认数据
-    async initSearchData() {
-    },
-    initData() {
-      this.listLoading = true;
-      let _query = {
-        ...this.listQuery,
-        ...this.query,
-        keyword: this.keyword,
-        dataType: 0,
-        menuId: this.menuId,
-        moduleId: '530031733014287557',
-        type: 1,
-      };
-      request({
-        url: `/api/scm/WarehousingReportloss/getList`,
-        method: 'post',
-        data: _query
-      }).then(res => {
-        var _list = res.data.list;
-        this.list = _list.map(o => ({
-          ...o,
-          ...this.expandObj,
-        }))
-        this.total = res.data.pagination.total
-        this.listLoading = false
-      })
-    },
-    handleDel(id) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
+        this.exportList = exportList
+      },
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      async initSearchDataAndListData() {
+        await this.initSearchData()
+        this.initData()
+      },
+      //初始化查询的默认数据
+      async initSearchData() {},
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          keyword: this.keyword,
+          dataType: 0,
+          menuId: this.menuId,
+          moduleId: '530031733014287557',
+          type: 1,
+        };
         request({
-          url: `/api/scm/WarehousingReportloss/${id}`,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingReportloss/getList`,
+          method: 'post',
+          data: _query
         }).then(res => {
+          var _list = res.data.list;
+          this.list = _list.map(o => ({
+            ...o,
+            ...this.expandObj,
+          }))
+          this.total = res.data.pagination.total
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingReportloss/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handelUpload() {
+        this.uploadBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.UploadBox.init("", "scm/WarehousingReportloss")
+        })
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
-          });
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingReportloss/batchRemove`,
+            data: ids,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {})
+      },
+      openSuperQuery() {
+        this.superQueryVisible = true
+        this.$nextTick(() => {
+          this.$refs.SuperQuery.init()
         })
-      }).catch(() => {
-      });
-    },
-    handelUpload() {
-      this.uploadBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/WarehousingReportloss")
-      })
-    },
-    handleSelectionChange(val) {
-      const res = val.map(item => item.id)
-      this.multipleSelection = res
-    },
-    handleBatchRemoveDel() {
-      if (!this.multipleSelection.length) {
-        this.$message({
-          type: 'error',
-          message: '请选择一条数据',
-          duration: 1500,
+      },
+      superQuery(queryJson) {
+        this.listQuery.superQueryJson = queryJson
+        this.listQuery.currentPage = 1
+        this.initData()
+      },
+      addOrUpdateHandle(row, flowState) {
+        if (!row) {
+          this.addHandle();
+        } else {
+          this.updateHandle(row, flowState)
+        }
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.exportList)
         })
-        return
-      }
-      const ids = this.multipleSelection
-      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-        type: 'warning'
-      }).then(() => {
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
         request({
-          url: `/api/scm/WarehousingReportloss/batchRemove`,
-          data: ids,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingReportloss/Actions/Export`,
+          method: 'post',
+          data: query
         }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery.currentPage = 1
+        this.listQuery.pageSize = 20
+        this.listQuery.sort = "desc"
+        this.listQuery.sidx = ""
+        this.initData()
+      },
+      //流程改造后相关调用方法
+      updateHandle(row, flowState) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId || this.flowList[0].id,
+          opType: flowState ? 0 : '-1',
+          status: flowState
+        }
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      toApprovalDetail(row) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId,
+          opType: 0,
+          status: row.currentState
+        }
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      addHandle() {
+        if (!this.flowList.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
+            type: 'error',
+            message: '流程不存在'
           });
+        } else if (this.flowList.length === 1) {
+          this.selectFlow(this.flowList[0])
+        } else {
+          this.flowListVisible = true
+        }
+      },
+      //选择流程发起
+      selectFlow(item) {
+        let data = {
+          id: '',
+          formType: 1,
+          flowId: item.id,
+          opType: '-1'
+        }
+        this.flowListVisible = false
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
         })
-      }).catch(() => {
-      })
-    },
-    openSuperQuery() {
-      this.superQueryVisible = true
-      this.$nextTick(() => {
-        this.$refs.SuperQuery.init()
-      })
-    },
-    superQuery(queryJson) {
-      this.listQuery.superQueryJson = queryJson
-      this.listQuery.currentPage = 1
-      this.initData()
-    },
-    addOrUpdateHandle(row, flowState) {
-      if (!row) {
-        this.addHandle();
-      } else {
-        this.updateHandle(row, flowState)
-      }
-    },
-    exportData() {
-      this.exportBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.exportList)
-      })
-    },
-    download(data) {
-      let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-      request({
-        url: `/api/scm/WarehousingReportloss/Actions/Export`,
-        method: 'post',
-        data: query
-      }).then(res => {
-        if (!res.data.url) return
-        this.jnpf.downloadFile(res.data.url)
-        this.$refs.ExportBox.visible = false
-        this.exportBoxVisible = false
-      })
-    },
-    search() {
-      this.listQuery.currentPage = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.sort = "desc"
-      this.listQuery.sidx = ""
-      this.initData()
-    },
-    //流程改造后相关调用方法
-    updateHandle(row, flowState) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId || this.flowList[0].id,
-        opType: flowState ? 0 : '-1',
-        status: flowState
-      }
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    toApprovalDetail(row) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId,
-        opType: 0,
-        status: row.currentState
-      }
-      this.formVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    addHandle() {
-      if (!this.flowList.length) {
-        this.$message({ type: 'error', message: '流程不存在' });
-      } else if (this.flowList.length === 1) {
-        this.selectFlow(this.flowList[0])
-      } else {
-        this.flowListVisible = true
-      }
-    },
-    //选择流程发起
-    selectFlow(item) {
-      let data = {
-        id: '',
-        formType: 1,
-        flowId: item.id,
-        opType: '-1'
-      }
-      this.flowListVisible = false
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    refresh(isrRefresh) {
-      this.formVisible = false
-      if (isrRefresh) this.reset()
-    },
-    reset() {
-      this.query = JSON.parse(JSON.stringify(this.queryData))
-      this.search()
-    },
-    colseFlow(isrRefresh) {
-      this.flowVisible = false
-      if (isrRefresh) this.reset()
-    },
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        this.query = JSON.parse(JSON.stringify(this.queryData))
+        this.search()
+      },
+      colseFlow(isrRefresh) {
+        this.flowVisible = false
+        if (isrRefresh) this.reset()
+      },
+    }
   }
-}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/form.vue
index 70585d0d..0e5097b7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('returnCode')">
             <jnpf-form-tip-item label="返库单编号" v-if="judgeShow('returnCode')" prop="returnCode">
@@ -64,27 +64,19 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
-          </el-col>
-          <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfText
-                :textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
-                content="默认展示关联单据的商品信息，可直接修改商品数量。">
-              </JnpfText>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.warehousingReturnProductList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('warehousingreturnproduct-productId')" prop="productId">
+              <el-table :data="dataForm.warehousingReturnProductList" size='mini' border>
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                <el-table-column label="商品名称" v-if="judgeShow('warehousingreturnproduct-productId')" prop="productId" align="center" width="220" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingreturnproductList-productId')">*</span>商品名称
@@ -103,7 +95,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" v-if="judgeShow('warehousingreturnproduct-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('warehousingreturnproduct-spec')" prop="spec" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign" v-if="judgeRequired('warehousingreturnproductList-spec')">*</span>规格
@@ -119,7 +111,7 @@
                 </el-table-column>
 
                 <el-table-column label="库存单位" v-if="judgeShow('warehousingreturnproduct-inventoryUnitIds')"
-                  prop="inventoryUnitIds">
+                  prop="inventoryUnitIds" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -135,7 +127,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="返库单位" v-if="judgeShow('warehousingreturnproduct-returnUnit')" prop="returnUnit">
+                <el-table-column label="返库单位" v-if="judgeShow('warehousingreturnproduct-returnUnit')" prop="returnUnit" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -156,7 +148,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="返库数量" v-if="judgeShow('warehousingreturnproduct-returnNumber')"
-                  prop="returnNumber">
+                  prop="returnNumber" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -172,7 +164,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="批次号" v-if="judgeShow('warehousingreturnproduct-batchNumber')"
-                  prop="batchNumber">
+                  prop="batchNumber" align="center" width="200">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -188,7 +180,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="货区名称" v-if="judgeShow('warehousingreturnproduct-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('warehousingreturnproduct-cargoId')" prop="cargoId" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -207,7 +199,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingreturnproductList')">
+                <el-table-column label="操作" width="50" align="center" fixed="right" v-if="!judgeWrite('warehousingreturnproductList')">
 
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
index 8e899a09..0eba20f1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -12,8 +5,8 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="创建时间">
-              <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期" />
+              <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                endPlaceholder="结束日期" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -29,15 +22,15 @@
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="返库时间">
-                <JnpfDateRangePicker v-model="query.returnTime" format="yyyy-MM-dd"
-                  startPlaceholder="开始日期" endPlaceholder="结束日期">
+                <JnpfDateRangePicker v-model="query.returnTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                  endPlaceholder="结束日期">
                 </JnpfDateRangePicker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="返库原因">
-                <JnpfSelect v-model="query.returnReason" placeholder="请选择" clearable
-                  :options="returnReasonOptions" :props="returnReasonProps" multiple>
+                <JnpfSelect v-model="query.returnReason" placeholder="请选择" clearable :options="returnReasonOptions"
+                  :props="returnReasonProps" multiple>
                 </JnpfSelect>
               </el-form-item>
             </el-col>
@@ -46,8 +39,7 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -60,11 +52,9 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
-              v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -76,39 +66,38 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="returnCode" label="返库单编号" align="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="returnCode" label="返库单编号" align="center" sortable width="200" fixed="left">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="仓库名称" align="left">
+          <el-table-column prop="warehouseId" label="仓库名称" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="returnTime" label="返库时间" align="left">
+          <el-table-column prop="returnTime" label="返库时间" align="center" width="150">
           </el-table-column>
-          <el-table-column label="返库原因" prop="returnReason" algin="left">
+          <el-table-column label="返库原因" prop="returnReason" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.returnReason}}
             </template>
           </el-table-column>
-          <el-table-column prop="businessId" label="关联单据" align="left">
+          <el-table-column prop="businessId" label="关联单据" align="center" width="200">
           </el-table-column>
 
-          <el-table-column prop="returnNum" label="返库总数量" align="left">
+          <el-table-column prop="returnNum" label="返库总数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建用户" align="left">
+          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@@ -118,503 +107,571 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" align="center" fixed="right" width="150">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn"
-                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
-                @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
+                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize" @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
-      lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id"
-          @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-      @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-      @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
+  import request from '@/utils/request'
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import {
+    getFormById
+  } from '@/api/workFlow/FormDesign'
+  import {
+    getFlowList
+  } from '@/api/workFlow/FlowEngine'
+  import FlowBox from '@/views/workFlow/components/FlowBox'
+  import ExportBox from '@/components/ExportBox'
+  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import {
+    getConfigData
+  } from '@/api/onlineDev/visualDev'
+  import {
+    getDefaultCurrentValueUserIdAsync
+  } from '@/api/permission/user'
+  import {
+    getDefaultCurrentValueDepartmentIdAsync
+  } from '@/api/permission/organize'
+  import columnList from './columnList'
+  import {
+    thousandsFormat
+  } from "@/components/Generator/utils/index"
+  import SuperQuery from '@/components/SuperQuery'
+  import superQueryJson from './superQueryJson'
 
-import request from '@/utils/request'
-import { mapGetters } from "vuex";
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import { getFormById } from '@/api/workFlow/FormDesign'
-import { getFlowList } from '@/api/workFlow/FlowEngine'
-import FlowBox from '@/views/workFlow/components/FlowBox'
-import ExportBox from '@/components/ExportBox'
-import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-import { getConfigData } from '@/api/onlineDev/visualDev'
-import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-import columnList from './columnList'
-import { thousandsFormat } from "@/components/Generator/utils/index"
-import SuperQuery from '@/components/SuperQuery'
-import superQueryJson from './superQueryJson'
-
-export default {
-  components: {
-    FlowBox,
-    ExportBox, ToFormDetail, SuperQuery
-  },
-  data() {
-    return {
+  export default {
+    components: {
+      FlowBox,
+      ExportBox,
+      ToFormDetail,
+      SuperQuery
+    },
+    data() {
+      return {
 
-      keyword: '',
-      expandsTree: true,
-      refreshTree: true,
-      toFormDetailVisible: false,
-      expandObj: {},
-      columnOptions: [],
-      mergeList: [],
-      exportList: [],
-      columnList,
+        keyword: '',
+        expandsTree: true,
+        refreshTree: true,
+        toFormDetailVisible: false,
+        expandObj: {},
+        columnOptions: [],
+        mergeList: [],
+        exportList: [],
+        columnList,
 
-      showAll: false,
-      superQueryVisible: false,
-      superQueryJson,
-      uploadBoxVisible: false,
-      detailVisible: false,
-      query: {
-        creatorTime: undefined,
-        creatorUserId: undefined,
-        returnCode: undefined,
-        returnTime: undefined,
-        returnReason: undefined,
-      },
-      treeProps: {
-        children: 'children',
-        label: 'fullName',
-        value: 'id',
-        isLeaf: 'isLeaf'
-      },
-      list: [],
-      listLoading: true,
-      multipleSelection: [], total: 0,
-      queryData: {},
-      listQuery: {
-        superQueryJson: '',
-        currentPage: 1,
-        pageSize: 20,
-        sort: "desc",
-        sidx: "",
-      },
-      formVisible: false,
-      flowVisible: false,
-      flowListVisible: false,
-      flowList: [],
-      exportBoxVisible: false,
-      returnReasonOptions: [{ "fullName": "质量问题", "id": "1" }, { "fullName": "客户退回", "id": "2" }, { "fullName": "试用", "id": "3" }, { "fullName": "临期报废", "id": "4" }, { "fullName": "维修", "id": "5" }, { "fullName": "保养", "id": "6" }, { "fullName": "作业工具", "id": "7" }, { "fullName": "其他", "id": "8" }],
-      returnReasonProps: { "label": "fullName", "value": "id" },
-      tableField116_productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" }, { "label": "批次号", "value": "batchNumber" },],
-      tableField116_returnUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
-      interfaceRes: {
-        warehouseId: [],
-        businessId: [],
-        tableField116_productId: [],
-        tableField116_returnUnit: [],
-      },
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    menuId() {
-      return this.$route.meta.modelId || ''
-    }
-  },
-  created() {
-    getFormById("531742877030571589").then(res1 => {
-      let flowId = res1.data && res1.data.id
-      getFlowList(flowId, '1').then(res2 => {
-        this.flowList = res2.data
-        this.getColumnList(),
-          this.initSearchDataAndListData()
-        this.queryData = JSON.parse(JSON.stringify(this.query))
-      }).catch((e) => {
-        this.$message({ type: 'error', message: e.message });
-        this.$router.push('/404');
-      })
-    })
-  },
-  methods: {
-    toDetail(defaultValue, modelId) {
-      if (!defaultValue) return
-      getConfigData(modelId).then(res => {
-        if (!res.data || !res.data.formData) return
-        let formData = JSON.parse(res.data.formData)
-        formData.popupType = 'general'
-        this.toFormDetailVisible = true
-        this.$nextTick(() => {
-          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+        showAll: false,
+        superQueryVisible: false,
+        superQueryJson,
+        uploadBoxVisible: false,
+        detailVisible: false,
+        query: {
+          creatorTime: undefined,
+          creatorUserId: undefined,
+          returnCode: undefined,
+          returnTime: undefined,
+          returnReason: undefined,
+        },
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id',
+          isLeaf: 'isLeaf'
+        },
+        list: [],
+        listLoading: true,
+        multipleSelection: [],
+        total: 0,
+        queryData: {},
+        listQuery: {
+          superQueryJson: '',
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        },
+        formVisible: false,
+        flowVisible: false,
+        flowListVisible: false,
+        flowList: [],
+        exportBoxVisible: false,
+        returnReasonOptions: [{
+          "fullName": "质量问题",
+          "id": "1"
+        }, {
+          "fullName": "客户退回",
+          "id": "2"
+        }, {
+          "fullName": "试用",
+          "id": "3"
+        }, {
+          "fullName": "临期报废",
+          "id": "4"
+        }, {
+          "fullName": "维修",
+          "id": "5"
+        }, {
+          "fullName": "保养",
+          "id": "6"
+        }, {
+          "fullName": "作业工具",
+          "id": "7"
+        }, {
+          "fullName": "其他",
+          "id": "8"
+        }],
+        returnReasonProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        tableField116_productIdcolumnOptions: [{
+          "label": "商品名称",
+          "value": "name"
+        }, {
+          "label": "规格",
+          "value": "spec"
+        }, {
+          "label": "批次号",
+          "value": "batchNumber"
+        }, ],
+        tableField116_returnUnitcolumnOptions: [{
+          "label": "单位名称",
+          "value": "unit_name"
+        }, ],
+        interfaceRes: {
+          warehouseId: [],
+          businessId: [],
+          tableField116_productId: [],
+          tableField116_returnUnit: [],
+        },
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      getFormById("531742877030571589").then(res1 => {
+        let flowId = res1.data && res1.data.id
+        getFlowList(flowId, '1').then(res2 => {
+          this.flowList = res2.data
+          this.getColumnList(),
+            this.initSearchDataAndListData()
+          this.queryData = JSON.parse(JSON.stringify(this.query))
+        }).catch((e) => {
+          this.$message({
+            type: 'error',
+            message: e.message
+          });
+          this.$router.push('/404');
         })
       })
     },
-    toggleTreeExpand(expands) {
-      this.refreshTree = false
-      this.expandsTree = expands
-      this.$nextTick(() => {
-        this.refreshTree = true
+    methods: {
+      toDetail(defaultValue, modelId) {
+        if (!defaultValue) return
+        getConfigData(modelId).then(res => {
+          if (!res.data || !res.data.formData) return
+          let formData = JSON.parse(res.data.formData)
+          formData.popupType = 'general'
+          this.toFormDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+          })
+        })
+      },
+      toggleTreeExpand(expands) {
+        this.refreshTree = false
+        this.expandsTree = expands
         this.$nextTick(() => {
-          this.$refs.treeBox.setCurrentKey(null)
+          this.refreshTree = true
+          this.$nextTick(() => {
+            this.$refs.treeBox.setCurrentKey(null)
+          })
         })
-      })
-    },
-    filterNode(value, data) {
-      if (!value) return true;
-      return data[this.treeProps.label].indexOf(value) !== -1;
-    },
-    loadNode(node, resolve) {
-      const nodeData = node.data
-      const config = {
-        treeInterfaceId: "",
-        treeTemplateJson: []
-      }
-      if (config.treeInterfaceId) {
-        //这里是为了拿到参数中关联的字段的值，后端自行拿
-        if (config.treeTemplateJson && config.treeTemplateJson.length) {
-          for (let i = 0; i < config.treeTemplateJson.length; i++) {
-            const element = config.treeTemplateJson[i];
-            element.defaultValue = nodeData[element.relationField] || ''
-          }
-        }
-        //参数
-        let query = {
-          paramList: config.treeTemplateJson || [],
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data[this.treeProps.label].indexOf(value) !== -1;
+      },
+      loadNode(node, resolve) {
+        const nodeData = node.data
+        const config = {
+          treeInterfaceId: "",
+          treeTemplateJson: []
         }
-        //接口
-        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-          let data = res.data
-          if (Array.isArray(data)) {
-            resolve(data);
-          } else {
-            resolve([]);
+        if (config.treeInterfaceId) {
+          //这里是为了拿到参数中关联的字段的值，后端自行拿
+          if (config.treeTemplateJson && config.treeTemplateJson.length) {
+            for (let i = 0; i < config.treeTemplateJson.length; i++) {
+              const element = config.treeTemplateJson[i];
+              element.defaultValue = nodeData[element.relationField] || ''
+            }
           }
-        })
-      }
-    },
-    getColumnList() {
-      // 没有开启权限
-      this.columnOptions = this.transformColumnList(this.columnList)
-    },
-    transformColumnList(columnList) {
-      let list = []
-      for (let i = 0; i < columnList.length; i++) {
-        const e = columnList[i];
-        if (!e.prop.includes('-')) {
-          list.push(e)
-        } else {
-          let prop = e.prop.split('-')[0]
-          let label = e.label.split('-')[0]
-          let vModel = e.prop.split('-')[1]
-          let newItem = {
-            align: "center",
-            jnpfKey: "table",
-            prop,
-            label,
-            children: []
+          //参数
+          let query = {
+            paramList: config.treeTemplateJson || [],
           }
-          e.vModel = vModel
-          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-          if (!list.some(o => o.prop === prop)) list.push(newItem)
-          for (let i = 0; i < list.length; i++) {
-            if (list[i].prop === prop) {
-              list[i].children.push(e)
-              break
+          //接口
+          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+            let data = res.data
+            if (Array.isArray(data)) {
+              resolve(data);
+            } else {
+              resolve([]);
             }
-          }
+          })
         }
-      }
-      this.getMergeList(list)
-      this.getExportList(list)
-      return list
-    },
-    arraySpanMethod({ column }) {
-      for (let i = 0; i < this.mergeList.length; i++) {
-        if (column.property == this.mergeList[i].prop) {
-          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+      },
+      getColumnList() {
+        // 没有开启权限
+        this.columnOptions = this.transformColumnList(this.columnList)
+      },
+      transformColumnList(columnList) {
+        let list = []
+        for (let i = 0; i < columnList.length; i++) {
+          const e = columnList[i];
+          if (!e.prop.includes('-')) {
+            list.push(e)
+          } else {
+            let prop = e.prop.split('-')[0]
+            let label = e.label.split('-')[0]
+            let vModel = e.prop.split('-')[1]
+            let newItem = {
+              align: "center",
+              jnpfKey: "table",
+              prop,
+              label,
+              children: []
+            }
+            e.vModel = vModel
+            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+            if (!list.some(o => o.prop === prop)) list.push(newItem)
+            for (let i = 0; i < list.length; i++) {
+              if (list[i].prop === prop) {
+                list[i].children.push(e)
+                break
+              }
+            }
+          }
         }
-      }
-    },
-    getMergeList(list) {
-      let newList = JSON.parse(JSON.stringify(list))
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          let child = {
-            prop: item.prop + '-child-first'
+        this.getMergeList(list)
+        this.getExportList(list)
+        return list
+      },
+      arraySpanMethod({
+        column
+      }) {
+        for (let i = 0; i < this.mergeList.length; i++) {
+          if (column.property == this.mergeList[i].prop) {
+            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
           }
-          item.children.unshift(child)
         }
-      })
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          item.children.forEach((child, index) => {
-            if (index == 0) {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 1,
-                colspan: item.children.length
-              })
-            } else {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 0,
-                colspan: 0
-              })
+      },
+      getMergeList(list) {
+        let newList = JSON.parse(JSON.stringify(list))
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            let child = {
+              prop: item.prop + '-child-first'
             }
-          })
-        } else {
-          this.mergeList.push({
-            prop: item.prop,
-            rowspan: 1,
-            colspan: 1
-          })
-        }
-      })
-    },
-    getExportList(list) {
-      let exportList = []
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].jnpfKey === 'table') {
-          for (let j = 0; j < list[i].children.length; j++) {
-            exportList.push(list[i].children[j])
+            item.children.unshift(child)
+          }
+        })
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            item.children.forEach((child, index) => {
+              if (index == 0) {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 1,
+                  colspan: item.children.length
+                })
+              } else {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 0,
+                  colspan: 0
+                })
+              }
+            })
+          } else {
+            this.mergeList.push({
+              prop: item.prop,
+              rowspan: 1,
+              colspan: 1
+            })
+          }
+        })
+      },
+      getExportList(list) {
+        let exportList = []
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].jnpfKey === 'table') {
+            for (let j = 0; j < list[i].children.length; j++) {
+              exportList.push(list[i].children[j])
+            }
+          } else {
+            exportList.push(list[i])
           }
-        } else {
-          exportList.push(list[i])
         }
-      }
-      this.exportList = exportList
-    },
-    goDetail(id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.Detail.init(id)
-      })
-    },
-    sortChange({ column, prop, order }) {
-      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-      this.listQuery.sidx = !order ? '' : prop
-      this.initData()
-    },
-    async initSearchDataAndListData() {
-      await this.initSearchData()
-      this.initData()
-    },
-    //初始化查询的默认数据
-    async initSearchData() {
-    },
-    initData() {
-      this.listLoading = true;
-      let _query = {
-        ...this.listQuery,
-        ...this.query,
-        keyword: this.keyword,
-        dataType: 0,
-        menuId: this.menuId,
-        moduleId: '531742877030571589',
-        type: 1,
-      };
-      request({
-        url: `/api/scm/WarehousingReturn/getList`,
-        method: 'post',
-        data: _query
-      }).then(res => {
-        var _list = res.data.list;
-        this.list = _list.map(o => ({
-          ...o,
-          ...this.expandObj,
-        }))
-        this.total = res.data.pagination.total
-        this.listLoading = false
-      })
-    },
-    handleDel(id) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
+        this.exportList = exportList
+      },
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      async initSearchDataAndListData() {
+        await this.initSearchData()
+        this.initData()
+      },
+      //初始化查询的默认数据
+      async initSearchData() {},
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          keyword: this.keyword,
+          dataType: 0,
+          menuId: this.menuId,
+          moduleId: '531742877030571589',
+          type: 1,
+        };
         request({
-          url: `/api/scm/WarehousingReturn/${id}`,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingReturn/getList`,
+          method: 'post',
+          data: _query
         }).then(res => {
+          var _list = res.data.list;
+          this.list = _list.map(o => ({
+            ...o,
+            ...this.expandObj,
+          }))
+          this.total = res.data.pagination.total
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingReturn/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handelUpload() {
+        this.uploadBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.UploadBox.init("", "scm/WarehousingReturn")
+        })
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
-          });
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingReturn/batchRemove`,
+            data: ids,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {})
+      },
+      openSuperQuery() {
+        this.superQueryVisible = true
+        this.$nextTick(() => {
+          this.$refs.SuperQuery.init()
         })
-      }).catch(() => {
-      });
-    },
-    handelUpload() {
-      this.uploadBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/WarehousingReturn")
-      })
-    },
-    handleSelectionChange(val) {
-      const res = val.map(item => item.id)
-      this.multipleSelection = res
-    },
-    handleBatchRemoveDel() {
-      if (!this.multipleSelection.length) {
-        this.$message({
-          type: 'error',
-          message: '请选择一条数据',
-          duration: 1500,
+      },
+      superQuery(queryJson) {
+        this.listQuery.superQueryJson = queryJson
+        this.listQuery.currentPage = 1
+        this.initData()
+      },
+      addOrUpdateHandle(row, flowState) {
+        if (!row) {
+          this.addHandle();
+        } else {
+          this.updateHandle(row, flowState)
+        }
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.exportList)
         })
-        return
-      }
-      const ids = this.multipleSelection
-      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-        type: 'warning'
-      }).then(() => {
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
         request({
-          url: `/api/scm/WarehousingReturn/batchRemove`,
-          data: ids,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingReturn/Actions/Export`,
+          method: 'post',
+          data: query
         }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery.currentPage = 1
+        this.listQuery.pageSize = 20
+        this.listQuery.sort = "desc"
+        this.listQuery.sidx = ""
+        this.initData()
+      },
+      //流程改造后相关调用方法
+      updateHandle(row, flowState) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId || this.flowList[0].id,
+          opType: flowState ? 0 : '-1',
+          status: flowState
+        }
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      toApprovalDetail(row) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId,
+          opType: 0,
+          status: row.currentState
+        }
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      addHandle() {
+        if (!this.flowList.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
+            type: 'error',
+            message: '流程不存在'
           });
+        } else if (this.flowList.length === 1) {
+          this.selectFlow(this.flowList[0])
+        } else {
+          this.flowListVisible = true
+        }
+      },
+      //选择流程发起
+      selectFlow(item) {
+        let data = {
+          id: '',
+          formType: 1,
+          flowId: item.id,
+          opType: '-1'
+        }
+        this.flowListVisible = false
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
         })
-      }).catch(() => {
-      })
-    },
-    openSuperQuery() {
-      this.superQueryVisible = true
-      this.$nextTick(() => {
-        this.$refs.SuperQuery.init()
-      })
-    },
-    superQuery(queryJson) {
-      this.listQuery.superQueryJson = queryJson
-      this.listQuery.currentPage = 1
-      this.initData()
-    },
-    addOrUpdateHandle(row, flowState) {
-      if (!row) {
-        this.addHandle();
-      } else {
-        this.updateHandle(row, flowState)
-      }
-    },
-    exportData() {
-      this.exportBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.exportList)
-      })
-    },
-    download(data) {
-      let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-      request({
-        url: `/api/scm/WarehousingReturn/Actions/Export`,
-        method: 'post',
-        data: query
-      }).then(res => {
-        if (!res.data.url) return
-        this.jnpf.downloadFile(res.data.url)
-        this.$refs.ExportBox.visible = false
-        this.exportBoxVisible = false
-      })
-    },
-    search() {
-      this.listQuery.currentPage = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.sort = "desc"
-      this.listQuery.sidx = ""
-      this.initData()
-    },
-    //流程改造后相关调用方法
-    updateHandle(row, flowState) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId || this.flowList[0].id,
-        opType: flowState ? 0 : '-1',
-        status: flowState
-      }
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    toApprovalDetail(row) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId,
-        opType: 0,
-        status: row.currentState
-      }
-      this.formVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    addHandle() {
-      if (!this.flowList.length) {
-        this.$message({ type: 'error', message: '流程不存在' });
-      } else if (this.flowList.length === 1) {
-        this.selectFlow(this.flowList[0])
-      } else {
-        this.flowListVisible = true
-      }
-    },
-    //选择流程发起
-    selectFlow(item) {
-      let data = {
-        id: '',
-        formType: 1,
-        flowId: item.id,
-        opType: '-1'
-      }
-      this.flowListVisible = false
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    refresh(isrRefresh) {
-      this.formVisible = false
-      if (isrRefresh) this.reset()
-    },
-    reset() {
-      this.query = JSON.parse(JSON.stringify(this.queryData))
-      this.search()
-    },
-    colseFlow(isrRefresh) {
-      this.flowVisible = false
-      if (isrRefresh) this.reset()
-    },
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        this.query = JSON.parse(JSON.stringify(this.queryData))
+        this.search()
+      },
+      colseFlow(isrRefresh) {
+        this.flowVisible = false
+        if (isrRefresh) this.reset()
+      },
+    }
   }
-}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
index 7ba9d795..b34c8f68 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('documentNo')">
             <jnpf-form-tip-item label="单据编号" v-if="judgeShow('documentNo')" prop="documentNo">
@@ -68,20 +68,17 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="附件" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">入库凭证</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
-              <div class="JNPF-common-title">
-                <h2>入库凭证</h2>
-              </div>
-              <el-table :data="dataForm.warehousingStoragePoundlistList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
+              <el-table :data="dataForm.warehousingStoragePoundlistList" size='mini' border>
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                 <el-table-column label="关联凭证" v-if="judgeShow('warehousingstoragepoundlist-voucherId')"
-                  prop="voucherId">
+                  prop="voucherId" align="center" width="220" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingstoragepoundlistList-voucherId')">*</span>关联凭证
@@ -100,7 +97,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="单据类型" prop="documentTypes">
+                <el-table-column label="单据类型" prop="documentTypes" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>单据类型
@@ -113,7 +110,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="凭证类型" prop="voucherType">
+                <el-table-column label="凭证类型" prop="voucherType" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>凭证类型
@@ -126,7 +123,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单编号" prop="poundCode">
+                <el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>磅单编号
@@ -139,7 +136,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单时间" prop="poundlistTime">
+                <el-table-column label="磅单时间" prop="poundlistTime" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>磅单时间
@@ -152,7 +149,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="车辆信息" prop="vehicleNumber">
+                <el-table-column label="车辆信息" prop="vehicleNumber" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>车辆信息
@@ -164,7 +161,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="商品名称" prop="productName">
+                <el-table-column label="商品名称" prop="productName" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>商品名称
@@ -177,7 +174,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" prop="productSpec">
+                <el-table-column label="规格" prop="productSpec" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>规格
@@ -189,7 +186,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="单位" prop="unit">
+                <el-table-column label="单位" prop="unit" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>单位
@@ -201,7 +198,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="毛重" prop="grossWeight">
+                <el-table-column label="毛重" prop="grossWeight" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>毛重
@@ -213,7 +210,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重" prop="tareWeight">
+                <el-table-column label="皮重" prop="tareWeight" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>皮重
@@ -225,7 +222,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="扣重" prop="buckleWeight">
+                <el-table-column label="扣重" prop="buckleWeight" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>扣重
@@ -237,7 +234,7 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重" prop="netWeight">
+                <el-table-column label="净重" prop="netWeight" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>净重
@@ -250,7 +247,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="备注" prop="remark">
+                <el-table-column label="备注" prop="remark" align="center" width="150">
 
                   <template slot="header">
                     <span class="required-sign"></span>备注
@@ -263,7 +260,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingstoragepoundlistList')">
+                <el-table-column label="操作" width="50" align="center" fixed="right" v-if="!judgeWrite('warehousingstoragepoundlistList')">
 
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
@@ -278,27 +275,19 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
-          </el-col>
-          <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfText
-                :textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 12, "line-height": 32, "font-style": "normal", "text-align": "left" }'
-                content="默认展示关联单据的商品信息，可直接修改商品数量。">
-              </JnpfText>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('warehousingstoragepoundlist-voucher_code')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.warehousingStorageProductList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('warehousingstorageproduct-productId')" prop="productId">
+              <el-table :data="dataForm.warehousingStorageProductList" size='mini' border>
+                <el-table-column type="index" width="50" fixed="left" label="序号" align="center" />
+                <el-table-column label="商品名称" v-if="judgeShow('warehousingstorageproduct-productId')" prop="productId" width="200" fixed="left" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -318,7 +307,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" prop="spec">
+                <el-table-column label="规格" prop="spec" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"></span>规格
@@ -331,7 +320,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="库存单位" prop="inventoryUnitIds">
+                <el-table-column label="库存单位" prop="inventoryUnitIds" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"></span>库存单位
@@ -345,7 +334,7 @@
                 </el-table-column>
 
                 <el-table-column label="入库单位" v-if="judgeShow('warehousingstorageproduct-storageUnit')"
-                  prop="storageUnit">
+                  prop="storageUnit" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -366,7 +355,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="入库单位规格" prop="111">
+                <el-table-column label="入库单位规格" prop="111" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"></span>入库单位规格
@@ -380,7 +369,7 @@
                 </el-table-column>
 
                 <el-table-column label="入库货区" v-if="judgeShow('warehousingstorageproduct-storageAreaId')"
-                  prop="storageAreaId">
+                  prop="storageAreaId" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -402,7 +391,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="入库数量" v-if="judgeShow('warehousingstorageproduct-storageNumber')"
-                  prop="storageNumber">
+                  prop="storageNumber" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -418,7 +407,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="批次号" v-if="judgeShow('warehousingstorageproduct-batchNumber')"
-                  prop="batchNumber">
+                  prop="batchNumber" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -434,7 +423,7 @@
                 </el-table-column>
 
                 <el-table-column label="生产日期" v-if="judgeShow('warehousingstorageproduct-dateManufacture')"
-                  prop="dateManufacture">
+                  prop="dateManufacture" width="200" align="center">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -451,7 +440,7 @@
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingstorageproductList')">
+                <el-table-column label="操作" width="50" align="center" fixed="right" v-if="!judgeWrite('warehousingstorageproductList')">
 
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
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 ba32866d..39f33c58 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
@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -18,15 +11,14 @@
           <el-col :span="6">
             <el-form-item label="业务类型">
               <JnpfSelect v-model="query.warehousingStorageType" placeholder="请选择" clearable
-                :options="warehousingStorageTypeOptions" :props="warehousingStorageTypeProps"
-                multiple>
+                :options="warehousingStorageTypeOptions" :props="warehousingStorageTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="入库时间">
-              <JnpfDateRangePicker v-model="query.warehousingTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.warehousingTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -44,8 +36,8 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
-                  startPlaceholder="开始日期" endPlaceholder="结束日期" />
+                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+                  endPlaceholder="结束日期" />
               </el-form-item>
             </el-col>
           </template>
@@ -53,8 +45,7 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -67,11 +58,9 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
-              v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -83,42 +72,41 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="documentNo" label="单据编号" align="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="documentNo" label="单据编号" align="center" sortable width="200" fixed="left">
           </el-table-column>
-          <el-table-column label="业务类型" prop="warehousingStorageType" algin="left">
+          <el-table-column label="业务类型" prop="warehousingStorageType" align="center" sortable width="150" fixed="left">
             <template slot-scope="scope">
               {{ scope.row.warehousingStorageType}}
             </template>
           </el-table-column>
 
-          <el-table-column prop="warehouseId" label="入库仓库" align="left">
+          <el-table-column prop="warehouseId" label="入库仓库" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="warehousingId" label="关联入库通知单号" align="left">
+          <el-table-column prop="warehousingId" label="关联入库通知单号" align="center" width="200">
           </el-table-column>
 
-          <el-table-column prop="purchaseNo" label="关联采购单号" align="left">
+          <el-table-column prop="purchaseNo" label="关联采购单号" align="center" width="200">
           </el-table-column>
 
-          <el-table-column prop="realityNumber" label="实际入库数量" align="left">
+          <el-table-column prop="realityNumber" label="实际入库数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建人" align="left">
+          <el-table-column prop="creatorUserId" label="创建人" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="更新时间" align="left">
+          <el-table-column prop="lastModifyTime" label="更新时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="更新人" align="left">
+          <el-table-column prop="lastModifyUserId" label="更新人" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@@ -128,510 +116,614 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" align="center" width="150">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn"
-                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
-                @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
+                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize" @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
-      lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id"
-          @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-      @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
-      @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
+  import request from '@/utils/request'
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import {
+    getFormById
+  } from '@/api/workFlow/FormDesign'
+  import {
+    getFlowList
+  } from '@/api/workFlow/FlowEngine'
+  import FlowBox from '@/views/workFlow/components/FlowBox'
+  import ExportBox from '@/components/ExportBox'
+  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import {
+    getConfigData
+  } from '@/api/onlineDev/visualDev'
+  import {
+    getDefaultCurrentValueUserIdAsync
+  } from '@/api/permission/user'
+  import {
+    getDefaultCurrentValueDepartmentIdAsync
+  } from '@/api/permission/organize'
+  import columnList from './columnList'
+  import {
+    thousandsFormat
+  } from "@/components/Generator/utils/index"
+  import SuperQuery from '@/components/SuperQuery'
+  import superQueryJson from './superQueryJson'
 
-import request from '@/utils/request'
-import { mapGetters } from "vuex";
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import { getFormById } from '@/api/workFlow/FormDesign'
-import { getFlowList } from '@/api/workFlow/FlowEngine'
-import FlowBox from '@/views/workFlow/components/FlowBox'
-import ExportBox from '@/components/ExportBox'
-import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-import { getConfigData } from '@/api/onlineDev/visualDev'
-import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
-import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
-import columnList from './columnList'
-import { thousandsFormat } from "@/components/Generator/utils/index"
-import SuperQuery from '@/components/SuperQuery'
-import superQueryJson from './superQueryJson'
-
-export default {
-  components: {
-    FlowBox,
-    ExportBox, ToFormDetail, SuperQuery
-  },
-  data() {
-    return {
+  export default {
+    components: {
+      FlowBox,
+      ExportBox,
+      ToFormDetail,
+      SuperQuery
+    },
+    data() {
+      return {
 
-      keyword: '',
-      expandsTree: true,
-      refreshTree: true,
-      toFormDetailVisible: false,
-      expandObj: {},
-      columnOptions: [],
-      mergeList: [],
-      exportList: [],
-      columnList,
+        keyword: '',
+        expandsTree: true,
+        refreshTree: true,
+        toFormDetailVisible: false,
+        expandObj: {},
+        columnOptions: [],
+        mergeList: [],
+        exportList: [],
+        columnList,
 
-      showAll: false,
-      superQueryVisible: false,
-      superQueryJson,
-      uploadBoxVisible: false,
-      detailVisible: false,
-      query: {
-        documentNo: undefined,
-        realityNumber: undefined,
-        purchaseNo: undefined,
-        warehousingStorageType: undefined,
-        warehousingTime: undefined,
-        tableField119_batchNumber: undefined,
-        creatorUserId: undefined,
-        creatorTime: undefined,
-      },
-      treeProps: {
-        children: 'children',
-        label: 'fullName',
-        value: 'id',
-        isLeaf: 'isLeaf'
-      },
-      list: [],
-      listLoading: true,
-      multipleSelection: [], total: 0,
-      queryData: {},
-      listQuery: {
-        superQueryJson: '',
-        currentPage: 1,
-        pageSize: 20,
-        sort: "desc",
-        sidx: "",
-      },
-      formVisible: false,
-      flowVisible: false,
-      flowListVisible: false,
-      flowList: [],
-      exportBoxVisible: false,
-      warehousingStorageTypeOptions: [{ "fullName": "全部", "id": "1" }, { "fullName": "盘盈入库", "id": "2" }, { "fullName": "采购入库", "id": "3" }, { "fullName": "调拨入库", "id": "4" }, { "fullName": "退货入库", "id": "5" }, { "fullName": "其他入库", "id": "6" }, { "fullName": "差异调整入库", "id": "7" }, { "fullName": "领用返库", "id": "8" }, { "fullName": "货权转移入库", "id": "9" }, { "fullName": "其他出库", "id": "10" }, { "fullName": "库存初始化", "id": "11" }, { "fullName": "调拨出库撤回", "id": "12" }, { "fullName": "其他出库撤回", "id": "13" }],
-      warehousingStorageTypeProps: { "label": "fullName", "value": "id" },
-      tableField114_voucherIdcolumnOptions: [{ "label": "凭证编号", "value": "voucher_code" }, { "label": "凭证类型", "value": "voucher_type" }, { "label": "车牌号", "value": "vehicle_number" }, { "label": "商品名称", "value": "product_name" },],
-      tableField119_productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品编码", "value": "code" }, { "label": "商品规格", "value": "spec" },],
-      tableField119_storageUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" }, { "label": "单位类型", "value": "unit_type" },],
-      tableField119_storageAreaIdcolumnOptions: [{ "label": "货区名称", "value": "name" }, { "label": "货区编码", "value": "code" },],
-      interfaceRes: {
-        warehousingId: [],
-        warehouseId: [],
-        tableField114_voucherId: [],
-        tableField119_productId: [],
-        tableField119_storageUnit: [],
-        tableField119_storageAreaId: [],
-      },
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    menuId() {
-      return this.$route.meta.modelId || ''
-    }
-  },
-  created() {
-    getFormById("529614060577116037").then(res1 => {
-      let flowId = res1.data && res1.data.id
-      getFlowList(flowId, '1').then(res2 => {
-        this.flowList = res2.data
-        this.getColumnList(),
-          this.initSearchDataAndListData()
-        this.queryData = JSON.parse(JSON.stringify(this.query))
-      }).catch((e) => {
-        this.$message({ type: 'error', message: e.message });
-        this.$router.push('/404');
-      })
-    })
-  },
-  methods: {
-    toDetail(defaultValue, modelId) {
-      if (!defaultValue) return
-      getConfigData(modelId).then(res => {
-        if (!res.data || !res.data.formData) return
-        let formData = JSON.parse(res.data.formData)
-        formData.popupType = 'general'
-        this.toFormDetailVisible = true
-        this.$nextTick(() => {
-          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+        showAll: false,
+        superQueryVisible: false,
+        superQueryJson,
+        uploadBoxVisible: false,
+        detailVisible: false,
+        query: {
+          documentNo: undefined,
+          realityNumber: undefined,
+          purchaseNo: undefined,
+          warehousingStorageType: undefined,
+          warehousingTime: undefined,
+          tableField119_batchNumber: undefined,
+          creatorUserId: undefined,
+          creatorTime: undefined,
+        },
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id',
+          isLeaf: 'isLeaf'
+        },
+        list: [],
+        listLoading: true,
+        multipleSelection: [],
+        total: 0,
+        queryData: {},
+        listQuery: {
+          superQueryJson: '',
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        },
+        formVisible: false,
+        flowVisible: false,
+        flowListVisible: false,
+        flowList: [],
+        exportBoxVisible: false,
+        warehousingStorageTypeOptions: [{
+          "fullName": "全部",
+          "id": "1"
+        }, {
+          "fullName": "盘盈入库",
+          "id": "2"
+        }, {
+          "fullName": "采购入库",
+          "id": "3"
+        }, {
+          "fullName": "调拨入库",
+          "id": "4"
+        }, {
+          "fullName": "退货入库",
+          "id": "5"
+        }, {
+          "fullName": "其他入库",
+          "id": "6"
+        }, {
+          "fullName": "差异调整入库",
+          "id": "7"
+        }, {
+          "fullName": "领用返库",
+          "id": "8"
+        }, {
+          "fullName": "货权转移入库",
+          "id": "9"
+        }, {
+          "fullName": "其他出库",
+          "id": "10"
+        }, {
+          "fullName": "库存初始化",
+          "id": "11"
+        }, {
+          "fullName": "调拨出库撤回",
+          "id": "12"
+        }, {
+          "fullName": "其他出库撤回",
+          "id": "13"
+        }],
+        warehousingStorageTypeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        tableField114_voucherIdcolumnOptions: [{
+          "label": "凭证编号",
+          "value": "voucher_code"
+        }, {
+          "label": "凭证类型",
+          "value": "voucher_type"
+        }, {
+          "label": "车牌号",
+          "value": "vehicle_number"
+        }, {
+          "label": "商品名称",
+          "value": "product_name"
+        }, ],
+        tableField119_productIdcolumnOptions: [{
+          "label": "商品名称",
+          "value": "name"
+        }, {
+          "label": "商品编码",
+          "value": "code"
+        }, {
+          "label": "商品规格",
+          "value": "spec"
+        }, ],
+        tableField119_storageUnitcolumnOptions: [{
+          "label": "单位名称",
+          "value": "unit_name"
+        }, {
+          "label": "单位类型",
+          "value": "unit_type"
+        }, ],
+        tableField119_storageAreaIdcolumnOptions: [{
+          "label": "货区名称",
+          "value": "name"
+        }, {
+          "label": "货区编码",
+          "value": "code"
+        }, ],
+        interfaceRes: {
+          warehousingId: [],
+          warehouseId: [],
+          tableField114_voucherId: [],
+          tableField119_productId: [],
+          tableField119_storageUnit: [],
+          tableField119_storageAreaId: [],
+        },
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      getFormById("529614060577116037").then(res1 => {
+        let flowId = res1.data && res1.data.id
+        getFlowList(flowId, '1').then(res2 => {
+          this.flowList = res2.data
+          this.getColumnList(),
+            this.initSearchDataAndListData()
+          this.queryData = JSON.parse(JSON.stringify(this.query))
+        }).catch((e) => {
+          this.$message({
+            type: 'error',
+            message: e.message
+          });
+          this.$router.push('/404');
         })
       })
     },
-    toggleTreeExpand(expands) {
-      this.refreshTree = false
-      this.expandsTree = expands
-      this.$nextTick(() => {
-        this.refreshTree = true
+    methods: {
+      toDetail(defaultValue, modelId) {
+        if (!defaultValue) return
+        getConfigData(modelId).then(res => {
+          if (!res.data || !res.data.formData) return
+          let formData = JSON.parse(res.data.formData)
+          formData.popupType = 'general'
+          this.toFormDetailVisible = true
+          this.$nextTick(() => {
+            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+          })
+        })
+      },
+      toggleTreeExpand(expands) {
+        this.refreshTree = false
+        this.expandsTree = expands
         this.$nextTick(() => {
-          this.$refs.treeBox.setCurrentKey(null)
+          this.refreshTree = true
+          this.$nextTick(() => {
+            this.$refs.treeBox.setCurrentKey(null)
+          })
         })
-      })
-    },
-    filterNode(value, data) {
-      if (!value) return true;
-      return data[this.treeProps.label].indexOf(value) !== -1;
-    },
-    loadNode(node, resolve) {
-      const nodeData = node.data
-      const config = {
-        treeInterfaceId: "",
-        treeTemplateJson: []
-      }
-      if (config.treeInterfaceId) {
-        //这里是为了拿到参数中关联的字段的值，后端自行拿
-        if (config.treeTemplateJson && config.treeTemplateJson.length) {
-          for (let i = 0; i < config.treeTemplateJson.length; i++) {
-            const element = config.treeTemplateJson[i];
-            element.defaultValue = nodeData[element.relationField] || ''
-          }
-        }
-        //参数
-        let query = {
-          paramList: config.treeTemplateJson || [],
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data[this.treeProps.label].indexOf(value) !== -1;
+      },
+      loadNode(node, resolve) {
+        const nodeData = node.data
+        const config = {
+          treeInterfaceId: "",
+          treeTemplateJson: []
         }
-        //接口
-        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-          let data = res.data
-          if (Array.isArray(data)) {
-            resolve(data);
-          } else {
-            resolve([]);
+        if (config.treeInterfaceId) {
+          //这里是为了拿到参数中关联的字段的值，后端自行拿
+          if (config.treeTemplateJson && config.treeTemplateJson.length) {
+            for (let i = 0; i < config.treeTemplateJson.length; i++) {
+              const element = config.treeTemplateJson[i];
+              element.defaultValue = nodeData[element.relationField] || ''
+            }
           }
-        })
-      }
-    },
-    getColumnList() {
-      // 没有开启权限
-      this.columnOptions = this.transformColumnList(this.columnList)
-    },
-    transformColumnList(columnList) {
-      let list = []
-      for (let i = 0; i < columnList.length; i++) {
-        const e = columnList[i];
-        if (!e.prop.includes('-')) {
-          list.push(e)
-        } else {
-          let prop = e.prop.split('-')[0]
-          let label = e.label.split('-')[0]
-          let vModel = e.prop.split('-')[1]
-          let newItem = {
-            align: "center",
-            jnpfKey: "table",
-            prop,
-            label,
-            children: []
+          //参数
+          let query = {
+            paramList: config.treeTemplateJson || [],
           }
-          e.vModel = vModel
-          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-          if (!list.some(o => o.prop === prop)) list.push(newItem)
-          for (let i = 0; i < list.length; i++) {
-            if (list[i].prop === prop) {
-              list[i].children.push(e)
-              break
+          //接口
+          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+            let data = res.data
+            if (Array.isArray(data)) {
+              resolve(data);
+            } else {
+              resolve([]);
             }
-          }
+          })
         }
-      }
-      this.getMergeList(list)
-      this.getExportList(list)
-      return list
-    },
-    arraySpanMethod({ column }) {
-      for (let i = 0; i < this.mergeList.length; i++) {
-        if (column.property == this.mergeList[i].prop) {
-          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+      },
+      getColumnList() {
+        // 没有开启权限
+        this.columnOptions = this.transformColumnList(this.columnList)
+      },
+      transformColumnList(columnList) {
+        let list = []
+        for (let i = 0; i < columnList.length; i++) {
+          const e = columnList[i];
+          if (!e.prop.includes('-')) {
+            list.push(e)
+          } else {
+            let prop = e.prop.split('-')[0]
+            let label = e.label.split('-')[0]
+            let vModel = e.prop.split('-')[1]
+            let newItem = {
+              align: "center",
+              jnpfKey: "table",
+              prop,
+              label,
+              children: []
+            }
+            e.vModel = vModel
+            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+            if (!list.some(o => o.prop === prop)) list.push(newItem)
+            for (let i = 0; i < list.length; i++) {
+              if (list[i].prop === prop) {
+                list[i].children.push(e)
+                break
+              }
+            }
+          }
         }
-      }
-    },
-    getMergeList(list) {
-      let newList = JSON.parse(JSON.stringify(list))
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          let child = {
-            prop: item.prop + '-child-first'
+        this.getMergeList(list)
+        this.getExportList(list)
+        return list
+      },
+      arraySpanMethod({
+        column
+      }) {
+        for (let i = 0; i < this.mergeList.length; i++) {
+          if (column.property == this.mergeList[i].prop) {
+            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
           }
-          item.children.unshift(child)
         }
-      })
-      newList.forEach(item => {
-        if (item.children && item.children.length) {
-          item.children.forEach((child, index) => {
-            if (index == 0) {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 1,
-                colspan: item.children.length
-              })
-            } else {
-              this.mergeList.push({
-                prop: child.prop,
-                rowspan: 0,
-                colspan: 0
-              })
+      },
+      getMergeList(list) {
+        let newList = JSON.parse(JSON.stringify(list))
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            let child = {
+              prop: item.prop + '-child-first'
             }
-          })
-        } else {
-          this.mergeList.push({
-            prop: item.prop,
-            rowspan: 1,
-            colspan: 1
-          })
-        }
-      })
-    },
-    getExportList(list) {
-      let exportList = []
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].jnpfKey === 'table') {
-          for (let j = 0; j < list[i].children.length; j++) {
-            exportList.push(list[i].children[j])
+            item.children.unshift(child)
+          }
+        })
+        newList.forEach(item => {
+          if (item.children && item.children.length) {
+            item.children.forEach((child, index) => {
+              if (index == 0) {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 1,
+                  colspan: item.children.length
+                })
+              } else {
+                this.mergeList.push({
+                  prop: child.prop,
+                  rowspan: 0,
+                  colspan: 0
+                })
+              }
+            })
+          } else {
+            this.mergeList.push({
+              prop: item.prop,
+              rowspan: 1,
+              colspan: 1
+            })
+          }
+        })
+      },
+      getExportList(list) {
+        let exportList = []
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].jnpfKey === 'table') {
+            for (let j = 0; j < list[i].children.length; j++) {
+              exportList.push(list[i].children[j])
+            }
+          } else {
+            exportList.push(list[i])
           }
-        } else {
-          exportList.push(list[i])
         }
-      }
-      this.exportList = exportList
-    },
-    goDetail(id) {
-      this.detailVisible = true
-      this.$nextTick(() => {
-        this.$refs.Detail.init(id)
-      })
-    },
-    sortChange({ column, prop, order }) {
-      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-      this.listQuery.sidx = !order ? '' : prop
-      this.initData()
-    },
-    async initSearchDataAndListData() {
-      await this.initSearchData()
-      this.initData()
-    },
-    //初始化查询的默认数据
-    async initSearchData() {
-    },
-    initData() {
-      this.listLoading = true;
-      let _query = {
-        ...this.listQuery,
-        ...this.query,
-        keyword: this.keyword,
-        dataType: 0,
-        menuId: this.menuId,
-        moduleId: '529614060577116037',
-        type: 1,
-      };
-      request({
-        url: `/api/scm/WarehousingStorage/getList`,
-        method: 'post',
-        data: _query
-      }).then(res => {
-        var _list = res.data.list;
-        this.list = _list.map(o => ({
-          ...o,
-          ...this.expandObj,
-        }))
-        this.total = res.data.pagination.total
-        this.listLoading = false
-      })
-    },
-    handleDel(id) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
+        this.exportList = exportList
+      },
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      async initSearchDataAndListData() {
+        await this.initSearchData()
+        this.initData()
+      },
+      //初始化查询的默认数据
+      async initSearchData() {},
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          keyword: this.keyword,
+          dataType: 0,
+          menuId: this.menuId,
+          moduleId: '529614060577116037',
+          type: 1,
+        };
         request({
-          url: `/api/scm/WarehousingStorage/${id}`,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingStorage/getList`,
+          method: 'post',
+          data: _query
         }).then(res => {
+          var _list = res.data.list;
+          this.list = _list.map(o => ({
+            ...o,
+            ...this.expandObj,
+          }))
+          this.total = res.data.pagination.total
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingStorage/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handelUpload() {
+        this.uploadBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.UploadBox.init("", "scm/WarehousingStorage")
+        })
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
-          });
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/scm/WarehousingStorage/batchRemove`,
+            data: ids,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {})
+      },
+      openSuperQuery() {
+        this.superQueryVisible = true
+        this.$nextTick(() => {
+          this.$refs.SuperQuery.init()
         })
-      }).catch(() => {
-      });
-    },
-    handelUpload() {
-      this.uploadBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/WarehousingStorage")
-      })
-    },
-    handleSelectionChange(val) {
-      const res = val.map(item => item.id)
-      this.multipleSelection = res
-    },
-    handleBatchRemoveDel() {
-      if (!this.multipleSelection.length) {
-        this.$message({
-          type: 'error',
-          message: '请选择一条数据',
-          duration: 1500,
+      },
+      superQuery(queryJson) {
+        this.listQuery.superQueryJson = queryJson
+        this.listQuery.currentPage = 1
+        this.initData()
+      },
+      addOrUpdateHandle(row, flowState) {
+        if (!row) {
+          this.addHandle();
+        } else {
+          this.updateHandle(row, flowState)
+        }
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.exportList)
         })
-        return
-      }
-      const ids = this.multipleSelection
-      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-        type: 'warning'
-      }).then(() => {
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
         request({
-          url: `/api/scm/WarehousingStorage/batchRemove`,
-          data: ids,
-          method: 'DELETE'
+          url: `/api/scm/WarehousingStorage/Actions/Export`,
+          method: 'post',
+          data: query
         }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery.currentPage = 1
+        this.listQuery.pageSize = 20
+        this.listQuery.sort = "desc"
+        this.listQuery.sidx = ""
+        this.initData()
+      },
+      //流程改造后相关调用方法
+      updateHandle(row, flowState) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId || this.flowList[0].id,
+          opType: flowState ? 0 : '-1',
+          status: flowState
+        }
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      toApprovalDetail(row) {
+        let data = {
+          id: row.id,
+          flowId: row.flowId,
+          opType: 0,
+          status: row.currentState
+        }
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
+        })
+      },
+      addHandle() {
+        if (!this.flowList.length) {
           this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
+            type: 'error',
+            message: '流程不存在'
           });
+        } else if (this.flowList.length === 1) {
+          this.selectFlow(this.flowList[0])
+        } else {
+          this.flowListVisible = true
+        }
+      },
+      //选择流程发起
+      selectFlow(item) {
+        let data = {
+          id: '',
+          formType: 1,
+          flowId: item.id,
+          opType: '-1'
+        }
+        this.flowListVisible = false
+        this.flowVisible = true
+        this.$nextTick(() => {
+          this.$refs.FlowBox.init(data)
         })
-      }).catch(() => {
-      })
-    },
-    openSuperQuery() {
-      this.superQueryVisible = true
-      this.$nextTick(() => {
-        this.$refs.SuperQuery.init()
-      })
-    },
-    superQuery(queryJson) {
-      this.listQuery.superQueryJson = queryJson
-      this.listQuery.currentPage = 1
-      this.initData()
-    },
-    addOrUpdateHandle(row, flowState) {
-      if (!row) {
-        this.addHandle();
-      } else {
-        this.updateHandle(row, flowState)
-      }
-    },
-    exportData() {
-      this.exportBoxVisible = true
-      this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.exportList)
-      })
-    },
-    download(data) {
-      let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
-      request({
-        url: `/api/scm/WarehousingStorage/Actions/Export`,
-        method: 'post',
-        data: query
-      }).then(res => {
-        if (!res.data.url) return
-        this.jnpf.downloadFile(res.data.url)
-        this.$refs.ExportBox.visible = false
-        this.exportBoxVisible = false
-      })
-    },
-    search() {
-      this.listQuery.currentPage = 1
-      this.listQuery.pageSize = 20
-      this.listQuery.sort = "desc"
-      this.listQuery.sidx = ""
-      this.initData()
-    },
-    //流程改造后相关调用方法
-    updateHandle(row, flowState) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId || this.flowList[0].id,
-        opType: flowState ? 0 : '-1',
-        status: flowState
-      }
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    toApprovalDetail(row) {
-      let data = {
-        id: row.id,
-        flowId: row.flowId,
-        opType: 0,
-        status: row.currentState
-      }
-      this.formVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    addHandle() {
-      if (!this.flowList.length) {
-        this.$message({ type: 'error', message: '流程不存在' });
-      } else if (this.flowList.length === 1) {
-        this.selectFlow(this.flowList[0])
-      } else {
-        this.flowListVisible = true
-      }
-    },
-    //选择流程发起
-    selectFlow(item) {
-      let data = {
-        id: '',
-        formType: 1,
-        flowId: item.id,
-        opType: '-1'
-      }
-      this.flowListVisible = false
-      this.flowVisible = true
-      this.$nextTick(() => {
-        this.$refs.FlowBox.init(data)
-      })
-    },
-    refresh(isrRefresh) {
-      this.formVisible = false
-      if (isrRefresh) this.reset()
-    },
-    reset() {
-      this.query = JSON.parse(JSON.stringify(this.queryData))
-      this.search()
-    },
-    colseFlow(isrRefresh) {
-      this.flowVisible = false
-      if (isrRefresh) this.reset()
-    },
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        this.query = JSON.parse(JSON.stringify(this.queryData))
+        this.search()
+      },
+      colseFlow(isrRefresh) {
+        this.flowVisible = false
+        if (isrRefresh) this.reset()
+      },
+    }
   }
-}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue
index 782d22b0..bb8df72a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基本信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('warehousingType')">
             <jnpf-form-tip-item label-width="0" prop="warehousingType">
@@ -20,12 +20,6 @@
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
-          </el-col>
           <el-col :span="8" v-if="judgeShow('warehousingCode')">
             <jnpf-form-tip-item label="通知编号" v-if="judgeShow('warehousingCode')"
               prop="warehousingCode">
@@ -46,10 +40,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="关联信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">关联信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessId')">
             <jnpf-form-tip-item label="采购订单" v-if="judgeShow('businessId')" prop="businessId">
@@ -270,10 +264,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="收货信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">收货信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('subjectBasicId')">
             <jnpf-form-tip-item label="客户名称" v-if="judgeShow('subjectBasicId')"
@@ -298,10 +292,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="发货信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">发货信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('enterpriseId')">
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
@@ -340,10 +334,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="其他信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">其他信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
@@ -354,10 +348,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
index 6494324e..ebd160d1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
@@ -44,50 +44,50 @@
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="warehousingCode" label="通知编号" align="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="warehousingCode" label="通知编号" align="center" sortable width="150" fixed="left">
           </el-table-column>
-          <el-table-column prop="businessId" label="采购订单" align="left">
+          <el-table-column prop="businessId" label="采购订单" align="center" sortable width="150" fixed="left">
           </el-table-column>
-          <el-table-column prop="subjectBasicId" label="供应商名称" align="left">
+          <el-table-column prop="subjectBasicId" label="供应商名称" align="center" sortable width="150" fixed="left">
           </el-table-column>
-          <el-table-column prop="shippingAddress" label="收货地址" align="left">
+          <el-table-column prop="shippingAddress" label="收货地址" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="enterpriseId" label="机构名称" align="left">
+          <el-table-column prop="enterpriseId" label="机构名称" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="入库仓库" align="left">
+          <el-table-column prop="warehouseId" label="入库仓库" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="notificationStorageNumber" label="计划入库数量" align="left">
+          <el-table-column prop="notificationStorageNumber" label="计划入库数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="receivedQantity" label="已确认入库数量" align="left">
+          <el-table-column prop="receivedQantity" label="已确认入库数量" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="remainingStockableQuantity" label="待确认入库数量" align="left">
+          <el-table-column prop="remainingStockableQuantity" label="待确认入库数量" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="期望送达时间" align="left">
+          <el-table-column prop="warehouseId" label="期望送达时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="deliveryType" label="配送方式" align="left">
+          <el-table-column prop="deliveryType" label="配送方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="transactionMode" label="交货方式" align="left">
+          <el-table-column prop="transactionMode" label="交货方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="transportMode" label="运输方式" align="left">
+          <el-table-column prop="transportMode" label="运输方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="carriageMode" label="承运方式" align="left">
+          <el-table-column prop="carriageMode" label="承运方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="carrier" label="承运商" align="left">
+          <el-table-column prop="carrier" label="承运商" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建用户" align="left">
+          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
@@ -97,7 +97,7 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" fixed="right" align="center" width="150">
             <template slot-scope="scope">
               <!-- <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue
index 7218ea72..78ee3634 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基本信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('warehousingType')">
             <jnpf-form-tip-item label-width="0" prop="warehousingType">
@@ -21,10 +21,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehousingCode')">
             <jnpf-form-tip-item label="通知编号" v-if="judgeShow('warehousingCode')"
@@ -46,10 +46,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="关联信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">关联信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessId')">
             <jnpf-form-tip-item label="销售订单" v-if="judgeShow('businessId')" prop="businessId">
@@ -270,10 +270,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="收货信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">收货信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('subjectBasicId')">
             <jnpf-form-tip-item label="客户名称" v-if="judgeShow('subjectBasicId')"
@@ -298,10 +298,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="发货信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">发货信息</span>
+              </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('enterpriseId')">
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
@@ -340,10 +340,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="其他信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">其他信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
@@ -354,10 +354,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+              <div style="padding:15px 0px">
+                  <span style="color: #409EFF;">▋</span>
+                  <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+              </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
index 8cb4ad9b..5bfcbaac 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
@@ -44,52 +44,52 @@
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="warehousingCode" label="通知编号" align="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          <el-table-column prop="warehousingCode" label="通知编号" align="center" sortable width="200" fixed="left">
           </el-table-column>
-          <el-table-column prop="businessId" label="销售订单" align="left">
+          <el-table-column prop="businessId" label="销售订单" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="subjectBasicId" label="客户名称" align="left">
+          <el-table-column prop="subjectBasicId" label="客户名称" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="shippingAddress" label="收货地址" align="left">
+          <el-table-column prop="shippingAddress" label="收货地址" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="enterpriseId" label="机构名称" align="left">
+          <el-table-column prop="enterpriseId" label="机构名称" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="发货仓库" align="left">
+          <el-table-column prop="warehouseId" label="发货仓库" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="deliveryAddress" label="发货地址" align="left">
+          <el-table-column prop="deliveryAddress" label="发货地址" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="notificationStorageNumber" label="计划出库数量" align="left">
+          <el-table-column prop="notificationStorageNumber" label="计划出库数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="receivedQantity" label="已确认出库数量" align="left">
+          <el-table-column prop="receivedQantity" label="已确认出库数量" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="remainingStockableQuantity" label="待确认出库数量" align="left">
+          <el-table-column prop="remainingStockableQuantity" label="待确认出库数量" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="期望送达时间" align="left">
+          <el-table-column prop="warehouseId" label="期望送达时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="deliveryType" label="配送方式" align="left">
+          <el-table-column prop="deliveryType" label="配送方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="transactionMode" label="交货方式" align="left">
+          <el-table-column prop="transactionMode" label="交货方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="transportMode" label="运输方式" align="left">
+          <el-table-column prop="transportMode" label="运输方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="carriageMode" label="承运方式" align="left">
+          <el-table-column prop="carriageMode" label="承运方式" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="carrier" label="承运商" align="left">
+          <el-table-column prop="carrier" label="承运商" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建用户" align="left">
+          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="left">
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="left">
+          <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="flowState" label="状态" width="100">
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
               <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
@@ -99,7 +99,7 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
+          <el-table-column label="操作" align="center" fixed="right" width="150">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑