Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

# Conflicts:
#	jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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(() => { })
             }

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

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>

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

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"

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>

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'">编辑

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"

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"

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"

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"

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

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'">编辑

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

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'">编辑