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

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BomMapper.xml

@@ -20,11 +20,10 @@
     </resultMap>
 
     <select id="getBomList" resultMap="getBomMap">
-        select
+        SELECT
         t1.*,
-        t4.name AS productName,
+        t4.NAME AS productName,
-        t4.code AS productCode,
+        t4.CODE AS productCode,
-        t4.inventory_unit_id AS inventoryUnitId,
         t4.spec AS productSpec,
         t5.category_name AS categoryName,
         CASE
@@ -33,13 +32,22 @@
         '标品'
         WHEN 2 THEN
         '加工'
-        END AS productTypeId
+        END AS productTypeId,
-
+        t7.unit_name AS inventoryUnitId
-        from jg_bom t1
+        FROM
-        LEFT JOIN jg_bom_item t2 ON t1.id=t2.bom_id AND t2.f_delete_mark is NULL
+        jg_bom t1
-        LEFT JOIN jg_bom_item_value t3 ON t1.id=t3.bom_id AND t3.f_delete_mark is NULL
+        LEFT JOIN jg_bom_item t2 ON t1.id = t2.bom_id
-        LEFT JOIN jg_product t4 ON t2.product_id=t4.id AND t4.f_delete_mark is NULL
+        AND t2.f_delete_mark
-        LEFT JOIN jg_product_category t5 ON t4.product_category_id=t5.id AND t5.f_delete_mark is NULL
+        IS NULL LEFT JOIN jg_bom_item_value t3 ON t1.id = t3.bom_id
+        AND t3.f_delete_mark
+        IS NULL LEFT JOIN jg_product t4 ON t2.product_id = t4.id
+        AND t4.f_delete_mark
+        IS NULL LEFT JOIN jg_product_category t5 ON t4.product_category_id = t5.id
+        AND t5.f_delete_mark
+        IS NULL LEFT JOIN jg_product_unit t6 ON t6.prouct_id = t4.id
+        AND t6.f_delete_mark
+        IS NULL LEFT JOIN jg_product_unitwarehouse t7 ON t6.product_unitwarehouse_id = t7.id
+        AND t7.f_delete_mark IS NULL
         ${ew.customSqlSegment} AND t1.f_delete_mark is null
         <if test="bomPagination.sidx != null and bomPagination.sidx != ''">
             ORDER BY ${bomPagination.sidx} ${bomPagination.sort}

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml

@@ -58,8 +58,9 @@
         JgFnUnitName ( inventory_unit_id ) AS inventoryUnitIds,
         JgFnUnitName ( operate_unit_id ) AS operateUnitIds
         FROM
-        jg_product
+        jg_product a
-        ${ew.customSqlSegment}
+        LEFT JOIN flow_task b ON a.id = b.f_process_id
+        ${ew.customSqlSegment} AND b.f_status = 2
         <if test="productWarehousePagination.sidx != null and productWarehousePagination.sidx != ''">
             ORDER BY ${productWarehousePagination.sidx} ${productWarehousePagination.sort}
         </if>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingInspectionMapper.xml

@@ -17,11 +17,13 @@
             t1.NAME,
             t1.CODE,
             t1.spec,
-            t1.inventory_unit_id AS inventoryUnitId
+            t5.unit_name AS inventoryUnitId
         FROM
             jg_product t1
                 LEFT JOIN jg_warehousing_inspection_product t2 ON t2.product_id = t1.id
                 LEFT JOIN jg_warehousing_inspection t3 ON t3.id = t2.inspection_id
+                LEFT JOIN jg_product_unit t4 ON t4.prouct_id = t1.id
+                LEFT JOIN jg_product_unitwarehouse t5 ON t4.product_unitwarehouse_id = t5.id
         WHERE
             t1.f_delete_mark IS NULL
           AND t3.id = #{id}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BomServiceImpl.java

@@ -436,20 +436,20 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
             if (form.getBomItemList()!=null){
             }
             if (form.getBomItemValueList()!=null){
-                        for(BomItemValueModel t : form.getBomItemValueList()){
+//                        for(BomItemValueModel t : form.getBomItemValueList()){
-                            if(StringUtil.isNotEmpty(t.getUnit())){
+//                            if(StringUtil.isNotEmpty(t.getUnit())){
-                                t.setUnit(t.getUnit().trim());
+//                                t.setUnit(t.getUnit().trim());
-                            }
+//                            }
-                            else{
+//                            else{
-                                return "-操作单位不能为空";
+//                                return "-操作单位不能为空";
-                            }
+//                            }
-                        }
+//                        }
                         for(BomItemValueModel t : form.getBomItemValueList()){
                             if(StringUtil.isNotEmpty(t.getProportionNum())){
                                 t.setProportionNum(t.getProportionNum().trim());
                             }
                             else{
-                                return "-比例数量不能为空";
+                                return "比例数量不能为空";
                             }
                         }
             }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java

@@ -714,7 +714,9 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 String value = productWarehousePagination.getCode() instanceof List ?
                         JsonUtil.getObjectToString(productWarehousePagination.getCode()) :
                         String.valueOf(productWarehousePagination.getCode());
-                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getCode,value);
+//                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getCode,value);
+                productWarehouseQueryWrapper.like("a.CODE",value);
+
 
             }
 
@@ -724,7 +726,9 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 String value = productWarehousePagination.getName() instanceof List ?
                         JsonUtil.getObjectToString(productWarehousePagination.getName()) :
                         String.valueOf(productWarehousePagination.getName());
-                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getName,value);
+//                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getName,value);
+                productWarehouseQueryWrapper.like("a.NAME",value);
+
 
             }
 
@@ -733,7 +737,8 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 String value = productWarehousePagination.getName() instanceof List ?
                         JsonUtil.getObjectToString(productWarehousePagination.getId()) :
                         String.valueOf(productWarehousePagination.getId());
-                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getId,value);
+//                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getId,value);
+                productWarehouseQueryWrapper.like("a.id",value);
 
             }
 
@@ -807,13 +812,13 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
             productWarehouseQueryWrapper.lambda().in(ProductWarehouseEntity::getId, intersection);
         }
         //是否有高级查询
-        if (StringUtil.isNotEmpty(superOp)){
+//        if (StringUtil.isNotEmpty(superOp)){
-            if (allSuperIDlist.size()==0){
+//            if (allSuperIDlist.size()==0){
-                allSuperIDlist.add("jnpfNullList");
+//                allSuperIDlist.add("jnpfNullList");
-            }
+//            }
-            List<String> finalAllSuperIDlist = allSuperIDlist;
+//            List<String> finalAllSuperIDlist = allSuperIDlist;
-            productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllSuperIDlist));
+//            productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllSuperIDlist));
-        }
+//        }
         //是否有数据过滤查询
         if (StringUtil.isNotEmpty(ruleOp)){
             if (allRuleIDlist.size()==0){
@@ -823,11 +828,13 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
             productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllRuleIDlist));
         }
         //假删除标志
-        productWarehouseQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
+//        productWarehouseQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
-
+        productWarehouseQueryWrapper.isNull("a.f_delete_mark");
         //排序
         if(StringUtil.isEmpty(productWarehousePagination.getSidx())){
-            productWarehouseQueryWrapper.lambda().orderByDesc(ProductWarehouseEntity::getId);
+//            productWarehouseQueryWrapper.lambda().orderByDesc(ProductWarehouseEntity::getId);
+            productWarehousePagination.setSidx("a.f_creator_time");
+            productWarehousePagination.setSort("DESC");
         }else{
             try {
                 String sidx = productWarehousePagination.getSidx();
@@ -836,7 +843,9 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 Field declaredField = productWarehouseEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                productWarehouseQueryWrapper="asc".equals(productWarehousePagination.getSort().toLowerCase())?productWarehouseQueryWrapper.orderByAsc(value):productWarehouseQueryWrapper.orderByDesc(value);
+//                productWarehouseQueryWrapper="asc".equals(productWarehousePagination.getSort().toLowerCase())?productWarehouseQueryWrapper.orderByAsc(value):productWarehouseQueryWrapper.orderByDesc(value);
+                productWarehousePagination.setSidx("a." + value);
+
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectbasicServiceImpl.java

@@ -646,6 +646,9 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
             return "账期不能为空";
         }
         //子表字段验证
+        if (form.getSubjectrepresentativeList()==null || form.getSubjectrepresentativeList().size() < 1){
+            return "至少需要一条代表人信息";
+        }
         if (form.getSubjectrepresentativeList()!=null){
             for(SubjectrepresentativeModel t : form.getSubjectrepresentativeList()){
                 if(StringUtil.isNotEmpty(t.getName())){

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VehicleServiceImpl.java

@@ -384,8 +384,26 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
                     return "车牌号不能为空";
                 }
         //子表字段验证
-            if (form.getVehicleDriverList()!=null){
+        if (form.getVehicleDriverList()==null||form.getVehicleDriverList().size()==0){
+            return "司机不能为空";
+        }else{
+            try {
+                VehicleDriverModel vehicleDriverModel =new VehicleDriverModel();
+                String driverId;
+                for (VehicleDriverModel model:form.getVehicleDriverList()){
+                    vehicleDriverModel.setDriverId(model.getDriverId());
+                    driverId =model.getDriverId();
+                    if (driverId==null){
+                        return "司机是必填项";
+                    }
+                }
+            }catch (Exception e){
+                return "司机是必填项";
             }
+        }
+//            if (form.getVehicleDriverList()!=null){
+//
+//            }
         return countRecover;
     }
     /**

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SubjectSettlementRulesController.java

@@ -310,6 +310,7 @@ public class SubjectSettlementRulesController {
         SubjectSettlementRulesEntity entity= subjectSettlementRulesService.getInfo(id);
         if(entity!=null){
             try{
+                subjectSettlementRulesForm.setCreatorUserId(entity.getCreatorUserId());
                 subjectSettlementRulesService.saveOrUpdate(subjectSettlementRulesForm,id,false);
             }catch(Exception e){
                 return ActionResult.fail("修改数据失败");

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SubjectaccountperiodrulesnoController.java

@@ -366,6 +366,7 @@ public class SubjectaccountperiodrulesnoController {
         SubjectaccountperiodrulesnoEntity entity= subjectaccountperiodrulesnoService.getInfo(id);
         if(entity!=null){
             try{
+                subjectaccountperiodrulesnoForm.setCreatorUserId(entity.getCreatorUserId());
                 subjectaccountperiodrulesnoService.saveOrUpdate(subjectaccountperiodrulesnoForm,id,false);
             }catch(Exception e){
                 return ActionResult.fail("修改数据失败");

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SubjectcreditratingnoController.java

@@ -8,6 +8,7 @@ import jnpf.base.ActionResult;
 import jnpf.base.UserInfo;
 import jnpf.constant.PermissionConst;
 import jnpf.exception.DataException;
+import jnpf.model.subjectsettlementrules.SubjectSettlementRulesConstant;
 import jnpf.permission.entity.OrganizeEntity;
 import jnpf.permission.entity.UserEntity;
 import jnpf.permission.service.OrganizeService;
@@ -347,6 +348,7 @@ public class SubjectcreditratingnoController {
         SubjectcreditratingnoEntity entity= subjectcreditratingnoService.getInfo(id);
         if(entity!=null){
             try{
+                subjectcreditratingnoForm.setCreatorUserId(entity.getCreatorUserId());
                 subjectcreditratingnoService.saveOrUpdate(subjectcreditratingnoForm,id,false);
             }catch(Exception e){
                 return ActionResult.fail("修改数据失败");
@@ -455,14 +457,15 @@ public class SubjectcreditratingnoController {
         subjectcreditratingnoEntity.setBusinessType(businessType);
         //查询同公司的最后一条审批通过的流程
         SubjectcreditratingnoEntity entity= subjectcreditratingnoService.queryDefaultCreditrules(subjectcreditratingnoEntity);
-
+        Map<String, Object> subjectcreditratingnoMap=new HashMap<>();
-        Map<String, Object> subjectcreditratingnoMap=JsonUtil.entityToMap(entity);
+        if(entity!=null){
-        subjectcreditratingnoMap.put("id", subjectcreditratingnoMap.get("id"));
+            subjectcreditratingnoMap.put("id", subjectcreditratingnoMap.get("id"));
-        //副表数据
+            //副表数据
-        //子表数据
+            //子表数据
-        List<SubjectcreditratingEntity> subjectcreditratingList = subjectcreditratingnoService.getSubjectcreditratingList(entity.getId());
+            List<SubjectcreditratingEntity> subjectcreditratingList = subjectcreditratingnoService.getSubjectcreditratingList(entity.getId());
-        subjectcreditratingnoMap.put("subjectcreditratingList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(subjectcreditratingList)));
+            subjectcreditratingnoMap.put("subjectcreditratingList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(subjectcreditratingList)));
-        subjectcreditratingnoMap = generaterSwapUtil.swapDataForm(subjectcreditratingnoMap,SubjectcreditratingnoConstant.getFormData(),SubjectcreditratingnoConstant.TABLEFIELDKEY,SubjectcreditratingnoConstant.TABLERENAMES);
+            subjectcreditratingnoMap = generaterSwapUtil.swapDataForm(subjectcreditratingnoMap,SubjectcreditratingnoConstant.getFormData(),SubjectcreditratingnoConstant.TABLEFIELDKEY,SubjectcreditratingnoConstant.TABLERENAMES);
+        }
         return ActionResult.success(subjectcreditratingnoMap);
     }
 }

jnpf-java-boot/jnpf-web/src/assets/font/alfont.css

@@ -0,0 +1,44 @@
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-35-Thin';
+  src: url('./AlibabaPuHuiTi-3-35-Thin.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-45-Light';
+  src: url('./AlibabaPuHuiTi-3-45-Light.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-55-Regular';
+  src: url('./AlibabaPuHuiTi-3-55-Regular.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-65-Medium';
+  src: url('./AlibabaPuHuiTi-3-65-Medium.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-75-SemiBold';
+  src: url('./AlibabaPuHuiTi-3-75-SemiBold.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-85-Bold';
+  src: url('./AlibabaPuHuiTi-3-85-Bold.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-95-ExtraBold';
+  src: url('./AlibabaPuHuiTi-3-95-ExtraBold.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-105-Heavy';
+  src: url('./AlibabaPuHuiTi-3-105-Heavy.otf')
+}
+
+@font-face {
+  font-family: 'AlibabaPuHuiTi-3-115-Black';
+  src: url('./AlibabaPuHuiTi-3-115-Black.otf')
+}

jnpf-java-boot/jnpf-web/src/assets/scss/font.scss

@@ -1,2 +1,7 @@
 @import "../fonts/ym/iconfont.css";
 @import "../fonts/ym-custom/iconfont.css";
+@import "../font/alfont.css";
+
+* {
+  font-family: 'AlibabaPuHuiTi-3-55-Regular';
+}

jnpf-java-boot/jnpf-web/src/lang/zh.js

@@ -1,150 +1,150 @@
 export default {
   route: {
-    "home": "首页",
+    // "home": "首页",
-    "dashboard": "门户展示",
+    // "dashboard": "门户展示",
-    "onlineDev": "在线开发",
+    // "onlineDev": "在线开发",
-    "onlineDev-webDesign": "功能设计",
+    // "onlineDev-webDesign": "功能设计",
-    "onlineDev-appDesign": "移动设计",
+    // "onlineDev-appDesign": "移动设计",
-    "onlineDev-dataReport": "报表设计",
+    // "onlineDev-dataReport": "报表设计",
-    "onlineDev-dataScreen": "大屏设计",
+    // "onlineDev-dataScreen": "大屏设计",
-    "onlineDev-visualPortal": "门户设计",
+    // "onlineDev-visualPortal": "门户设计",
-    "generator": "代码生成",
+    // "generator": "代码生成",
-    "generator-webForm": "功能表单",
+    // "generator-webForm": "功能表单",
-    "generator-appForm": "移动表单",
+    // "generator-appForm": "移动表单",
-    "generator-flowForm": "发起表单",
+    // "generator-flowForm": "发起表单",
-    "system": "系统管理",
+    // "system": "系统管理",
-    "system-sysConfig": "系统配置",
+    // "system-sysConfig": "系统配置",
-    "system-notice": "系统公告",
+    // "system-notice": "系统公告",
-    "system-task": "系统调度",
+    // "system-task": "系统调度",
-    "system-cache": "系统缓存",
+    // "system-cache": "系统缓存",
-    "system-log": "系统日志",
+    // "system-log": "系统日志",
-    "system-monitor": "系统监控",
+    // "system-monitor": "系统监控",
-    "system-icons": "系统图标",
+    // "system-icons": "系统图标",
-    "system-language": "翻译管理",
+    // "system-language": "翻译管理",
-    "system-menu": "系统菜单",
+    // "system-menu": "系统菜单",
-    "system-area": "行政区划",
+    // "system-area": "行政区划",
-    "system-billRule": "单据模板",
+    // "system-billRule": "单据模板",
-    "system-systemTemplate": "系统模板",
+    // "system-systemTemplate": "系统模板",
-    "system-smsTemplate": "短信模板",
+    // "system-smsTemplate": "短信模板",
-    "system-messageTemplate": "消息模板",
+    // "system-messageTemplate": "消息模板",
-    "system-printDev": "打印模板",
+    // "system-printDev": "打印模板",
-    "systemData": "数据应用",
+    // "systemData": "数据应用",
-    "systemData-dataSource": "数据连接",
+    // "systemData-dataSource": "数据连接",
-    "systemData-dataModel": "数据建模",
+    // "systemData-dataModel": "数据建模",
-    "systemData-dataSync": "数据同步",
+    // "systemData-dataSync": "数据同步",
-    "systemData-dataBackup": "数据备份",
+    // "systemData-dataBackup": "数据备份",
-    "systemData-dataInterface": "数据接口",
+    // "systemData-dataInterface": "数据接口",
-    "systemData-interfaceAuth": "接口认证",
+    // "systemData-interfaceAuth": "接口认证",
-    "systemData-dictionary": "数据字典",
+    // "systemData-dictionary": "数据字典",
-    "systemData-map": "数据地图",
+    // "systemData-map": "数据地图",
-    'commonWords': '审批常用语',
+    // 'commonWords': '审批常用语',
-    "weChat": "微信配置",
+    // "weChat": "微信配置",
-    "weChat-mpConfig": "公众号配置",
+    // "weChat-mpConfig": "公众号配置",
-    "weChat-mpMenu": "公众号菜单",
+    // "weChat-mpMenu": "公众号菜单",
-    "weChat-mpUser": "公众号用户",
+    // "weChat-mpUser": "公众号用户",
-    "weChat-mpMessage": "公众号消息",
+    // "weChat-mpMessage": "公众号消息",
-    "weChat-mpMaterial": "公众号素材",
+    // "weChat-mpMaterial": "公众号素材",
-    "weChat-qyhConfig": "企业号配置",
+    // "weChat-qyhConfig": "企业号配置",
-    "weChat-qyDepartment": "企业号组织",
+    // "weChat-qyDepartment": "企业号组织",
-    "weChat-qyUser": "企业号用户",
+    // "weChat-qyUser": "企业号用户",
-    "weChat-qyMessage": "企业号消息",
+    // "weChat-qyMessage": "企业号消息",
-    "permission": "组织权限",
+    // "permission": "组织权限",
-    "permission-grade": "分级管理",
+    // // "permission-grade": "分级管理",
-    "permission-organize": "组织管理",
+    // "permission-organize": "组织管理",
-    "permission-department": "部门管理",
+    // "permission-department": "部门管理",
-    "permission-position": "岗位管理",
+    // "permission-position": "岗位管理",
-    "permission-user": "用户管理",
+    // "permission-user": "用户管理",
-    "permission-role": "角色管理",
+    // "permission-role": "角色管理",
-    "permission-group": "分组管理",
+    // "permission-group": "分组管理",
-    "permission-authorize": "权限管理",
+    // "permission-authorize": "权限管理",
-    "permission-userOnline": "在线用户",
+    // "permission-userOnline": "在线用户",
-    'flowEngine': '流程引擎',
+    // 'flowEngine': '流程引擎',
-    'formDesign': '流程表单',
+    // 'formDesign': '流程表单',
-    "workFlow": "工作流程",
+    // "workFlow": "工作流程",
-    "workFlow-form": "表单设计",
+    // "workFlow-form": "表单设计",
-    "workFlow-flowEngine": "流程设计",
+    // "workFlow-flowEngine": "流程设计",
-    "workFlow-addFlow": "新建流程",
+    // "workFlow-addFlow": "新建流程",
-    "workFlow-flowLaunch": "我发起的",
+    // "workFlow-flowLaunch": "我发起的",
-    "workFlow-flowTodo": "待办事宜",
+    // "workFlow-flowTodo": "待办事宜",
-    "workFlow-flowDone": "已办事宜",
+    // "workFlow-flowDone": "已办事宜",
-    "workFlow-flowCirculate": "抄送事宜",
+    // "workFlow-flowCirculate": "抄送事宜",
-    "workFlow-entrust": "流程委托",
+    // "workFlow-entrust": "流程委托",
-    "workFlow-flowMonitor": "流程监控",
+    // "workFlow-flowMonitor": "流程监控",
-    "msgCenter": "消息中心",
+    // "msgCenter": "消息中心",
-    "msgCenter-accountConfig": "账号配置",
+    // "msgCenter-accountConfig": "账号配置",
-    "msgCenter-accountConfig-mail": "邮箱配置",
+    // "msgCenter-accountConfig-mail": "邮箱配置",
-    "msgCenter-accountConfig-shortMsg": "短信配置",
+    // "msgCenter-accountConfig-shortMsg": "短信配置",
-    "msgCenter-accountConfig-weCom": "企业微信配置",
+    // "msgCenter-accountConfig-weCom": "企业微信配置",
-    "msgCenter-accountConfig-ding": "钉钉配置",
+    // "msgCenter-accountConfig-ding": "钉钉配置",
-    "msgCenter-accountConfig-webhook": "webhook配置",
+    // "msgCenter-accountConfig-webhook": "webhook配置",
-    "msgCenter-accountConfig-mp": "微信公众号配置",
+    // "msgCenter-accountConfig-mp": "微信公众号配置",
-    "msgCenter-msgTemplate": "消息模板",
+    // "msgCenter-msgTemplate": "消息模板",
-    "msgCenter-sendConfig": "发送配置",
+    // "msgCenter-sendConfig": "发送配置",
-    "msgCenter-msgMonitor": "消息监控",
+    // "msgCenter-msgMonitor": "消息监控",
-    "extend-graphDemo": "图表示例",
+    // "extend-graphDemo": "图表示例",
-    "extend-graphDemo-echartsBar": "E-柱状图",
+    // "extend-graphDemo-echartsBar": "E-柱状图",
-    "extend-graphDemo-echartsPie": "E-饼状图",
+    // "extend-graphDemo-echartsPie": "E-饼状图",
-    "extend-graphDemo-echartsBarAcross": "E-横状条形图",
+    // "extend-graphDemo-echartsBarAcross": "E-横状条形图",
-    "extend-graphDemo-echartsGauge": "E-仪表图",
+    // "extend-graphDemo-echartsGauge": "E-仪表图",
-    "extend-graphDemo-echartsLineArea": "E-线形图",
+    // "extend-graphDemo-echartsLineArea": "E-线形图",
-    "extend-graphDemo-echartsScatter": "E-散点图",
+    // "extend-graphDemo-echartsScatter": "E-散点图",
-    "extend-graphDemo-echartsCandlestick": "E-K线图",
+    // "extend-graphDemo-echartsCandlestick": "E-K线图",
-    "extend-graphDemo-echartsLineBar": "E-折柱混合图",
+    // "extend-graphDemo-echartsLineBar": "E-折柱混合图",
-    "extend-graphDemo-echartsTree": "E-树形图",
+    // "extend-graphDemo-echartsTree": "E-树形图",
-    "extend-graphDemo-echartsFunnel": "E-漏斗图",
+    // "extend-graphDemo-echartsFunnel": "E-漏斗图",
-    "extend-graphDemo-highchartsScatter": "H-散点图",
+    // "extend-graphDemo-highchartsScatter": "H-散点图",
-    "extend-graphDemo-highchartsWordcloud": "H-词云图",
+    // "extend-graphDemo-highchartsWordcloud": "H-词云图",
-    "extend-graphDemo-highchartsLine": "H-线性图",
+    // "extend-graphDemo-highchartsLine": "H-线性图",
-    "extend-graphDemo-highchartsArea": "H-面积图",
+    // "extend-graphDemo-highchartsArea": "H-面积图",
-    "extend-graphDemo-highchartsGauge": "H-仪表图",
+    // "extend-graphDemo-highchartsGauge": "H-仪表图",
-    "extend-graphDemo-highchartsBellcurve": "H-贝尔曲线",
+    // "extend-graphDemo-highchartsBellcurve": "H-贝尔曲线",
-    "extend-graphDemo-highchartsFunnel": "H-漏斗图",
+    // "extend-graphDemo-highchartsFunnel": "H-漏斗图",
-    "extend-graphDemo-highchartsBullet": "H-子弹图",
+    // "extend-graphDemo-highchartsBullet": "H-子弹图",
-    "extend-graphDemo-highchartsColumn": "H-柱状图",
+    // "extend-graphDemo-highchartsColumn": "H-柱状图",
-    "extend-graphDemo-highchartsPie": "H-饼状图",
+    // "extend-graphDemo-highchartsPie": "H-饼状图",
-    "extend-tableDemo": "表格示例",
+    // "extend-tableDemo": "表格示例",
-    "extend-tableDemo-commonTable": "普通表格",
+    // "extend-tableDemo-commonTable": "普通表格",
-    "extend-tableDemo-statisticsTable": "表格统计",
+    // "extend-tableDemo-statisticsTable": "表格统计",
-    "extend-tableDemo-lockTable": "表格锁定",
+    // "extend-tableDemo-lockTable": "表格锁定",
-    "extend-tableDemo-groupingTable": "表格分组",
+    // "extend-tableDemo-groupingTable": "表格分组",
-    "extend-tableDemo-redactTable": "表格编辑",
+    // "extend-tableDemo-redactTable": "表格编辑",
-    "extend-tableDemo-complexHeader": "复杂表头",
+    // "extend-tableDemo-complexHeader": "复杂表头",
-    "extend-tableDemo-mergeTable": "表格合并",
+    // "extend-tableDemo-mergeTable": "表格合并",
-    "extend-tableDemo-printTable": "表格打印",
+    // "extend-tableDemo-printTable": "表格打印",
-    "extend-tableDemo-extension": "延伸扩展",
+    // "extend-tableDemo-extension": "延伸扩展",
-    "extend-tableDemo-treeTable": "树形表格",
+    // "extend-tableDemo-treeTable": "树形表格",
-    "extend-tableDemo-postilTable": "表格批注",
+    // "extend-tableDemo-postilTable": "表格批注",
-    "extend-tableDemo-tableTree": "表格树形",
+    // "extend-tableDemo-tableTree": "表格树形",
-    "extend-tableDemo-signTable": "表格标记",
+    // "extend-tableDemo-signTable": "表格标记",
-    "extend-formDemo": "表单示例",
+    // "extend-formDemo": "表单示例",
-    "extend-formDemo-verifyForm": "表单验证",
+    // "extend-formDemo-verifyForm": "表单验证",
-    "extend-formDemo-verifyForm1": "表单验证1",
+    // "extend-formDemo-verifyForm1": "表单验证1",
-    "extend-formDemo-fieldForm1": "表单字段1",
+    // "extend-formDemo-fieldForm1": "表单字段1",
-    "extend-formDemo-fieldForm2": "表单字段2",
+    // "extend-formDemo-fieldForm2": "表单字段2",
-    "extend-formDemo-fieldForm3": "表单字段3",
+    // "extend-formDemo-fieldForm3": "表单字段3",
-    "extend-formDemo-fieldForm4": "表单字段4",
+    // "extend-formDemo-fieldForm4": "表单字段4",
-    "extend-formDemo-fieldForm5": "表单字段5",
+    // "extend-formDemo-fieldForm5": "表单字段5",
-    "extend-formDemo-fieldForm6": "表单字段6",
+    // "extend-formDemo-fieldForm6": "表单字段6",
-    "extend": "扩展应用",
+    // "extend": "扩展应用",
-    "extend-bigData": "百万数据",
+    // "extend-bigData": "百万数据",
-    "extend-functionDemo": "功能示例",
+    // "extend-functionDemo": "功能示例",
-    "extend-portalDemo": "门户示例",
+    // "extend-portalDemo": "门户示例",
-    "extend-orderDemo": "订单示例",
+    // "extend-orderDemo": "订单示例",
-    "extend-importAndExport": "导入导出",
+    // "extend-importAndExport": "导入导出",
-    "extend-signet": "电子签章",
+    // "extend-signet": "电子签章",
-    "extend-signature": '电子签名',
+    // "extend-signature": '电子签名',
-    "extend-schedule": "日程安排",
+    // "extend-schedule": "日程安排",
-    "extend-email": "邮件收发",
+    // "extend-email": "邮件收发",
-    "extend-document": "知识管理",
+    // "extend-document": "知识管理",
-    "extend-documentPreview": "文档示例",
+    // "extend-documentPreview": "文档示例",
-    "extend-barCode": "条码示例",
+    // "extend-barCode": "条码示例",
-    "extend-printData": "打印示例",
+    // "extend-printData": "打印示例",
-    "extend-map": "地图示例",
+    // "extend-map": "地图示例",
-    "extend-order": "订单管理",
+    // "extend-order": "订单管理",
-    "extend-projectGantt": "项目管理",
+    // "extend-projectGantt": "项目管理",
-    "moreMenu": "更多...",
+    // "moreMenu": "更多...",
-    "dataReport": "报表示例",
+    // "dataReport": "报表示例",
-    "reportBI": "大屏示例",
+    // "reportBI": "大屏示例",
   },
   navbar: {
     systemChange: '应用切换',

jnpf-java-boot/jnpf-web/src/views/extend/customer/creditrulesConfig/index.vue

@@ -174,7 +174,12 @@ export default {
       })
       //查询生效的信用等级规则和信用规则配置
       queryDefaultCreditrating('1').then(res => {
-        this.defaultCreditrating = res.data.subjectcreditratingList
+        if(res.data.subjectcreditratingList){
+          this.defaultCreditrating = res.data.subjectcreditratingList
+          res.data.subjectcreditratingList.forEach(item => {
+            item.annex = JSON.parse(item.annex)
+          })
+        }
       })
       queryDefaultCreditrules('1').then(res => {
         this.defaultCreditrules = res.data

jnpf-java-boot/jnpf-web/src/views/extend/customer/riskConfig/index.vue

@@ -10,66 +10,66 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="压款金额" class="mt-10">
-            <el-input v-model="defaultSettlementRules.underpaymentAmountDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentAmountDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.underpaymentAmountUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentAmountUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="压款比例" class="mt-10">
-            <el-input v-model="defaultSettlementRules.underpaymentRateDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentRateDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.underpaymentRateUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentRateUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="保证金金额" class="mt-10">
-            <el-input v-model="defaultSettlementRules.marginAmountDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginAmountDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.marginAmountUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginAmountUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="保证金比例" class="mt-10">
-            <el-input v-model="defaultSettlementRules.marginRateDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginRateDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.marginRateUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginRateUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="逾期年化" class="mt-10">
-            <el-input v-model="defaultSettlementRules.overdueAnnualizedDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueAnnualizedDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.overdueAnnualizedUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueAnnualizedUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="逾期月化" class="mt-10">
-            <el-input v-model="defaultSettlementRules.overdueMonthlyDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueMonthlyDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.overdueMonthlyUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueMonthlyUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>

jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue

@@ -40,7 +40,7 @@
           <el-col :span="8" v-if="judgeShow('name')">
             <jnpf-form-tip-item label="客户名称" v-if="judgeShow('name')" prop="name">
               <JnpfInput v-model="dataForm.name" @change="changeData('name', -1)" placeholder="请输入"
-                :disabled="judgeWrite('name')" clearable :style='{ "width": "100%" }'>
+                :disabled="judgeWrite('name')" clearable :style='{ "width": "100%" }' @input="nameChange">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -160,7 +160,7 @@
           <el-col :span="8" v-if="judgeShow('registerAddress')">
             <jnpf-form-tip-item label="注册地址" v-if="judgeShow('registerAddress')" prop="registerAddress">
               <JnpfInput v-model="dataForm.registerAddress" @change="changeData('registerAddress', -1)"
-                placeholder="请输入" :disabled="judgeWrite('registerAddress')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('registerAddress')" clearable :style='{ "width": "100%" }' @input="registerAddressChange">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -194,7 +194,7 @@
           <el-col :span="8" v-if="judgeShow('registerFunds')">
             <jnpf-form-tip-item label="注册资金" v-if="judgeShow('registerFunds')" prop="registerFunds">
               <JnpfInput v-model="dataForm.registerFunds" @change="changeData('registerFunds', -1)" placeholder="请输入"
-                :disabled="judgeWrite('registerFunds')" addonAfter="元" clearable :style='{ "width": "100%" }'>
+                :disabled="judgeWrite('registerFunds')" addonAfter="万元" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -579,23 +579,23 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('advanceRatio') && dataForm.settlementMethod == 2">
-            <jnpf-form-tip-item label="预付比例" v-if="judgeShow('advanceRatio')" prop="advanceRatio">
+            <jnpf-form-tip-item label="预付比例(%)" v-if="judgeShow('advanceRatio')" prop="advanceRatio">
-              <JnpfInput v-model="dataForm.advanceRatio" @change="changeData('advanceRatio', -1)" placeholder="请输入"
+              <JnpfInputNumber v-model="dataForm.advanceRatio" @change="changeData('advanceRatio', -1)" placeholder="请输入"
-                :disabled="judgeWrite('advanceRatio')" addonAfter="%" clearable :style='{ "width": "100%" }'>
+                :disabled="judgeWrite('advanceRatio')" addonAfter="%" clearable :style='{ "width": "100%" }' :max="Number(defaultAccountPeriod.advanceRatioUpper)" :min="Number(defaultAccountPeriod.advanceRatioDown)">
-              </JnpfInput>
+              </JnpfInputNumber>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('accountPeriod')">
             <jnpf-form-tip-item label="默认账期" v-if="judgeShow('accountPeriod')">
               <el-row style="width: 100%;">
-                <el-col span="10">
+                <el-col :span="10">
                   <JnpfInput v-model="defaultAccountPeriod.accountPeriodDown" :disabled="true" addonAfter="天">
                   </JnpfInput>
                 </el-col>
-                <el-col span="4" style="text-align: center;">
+                <el-col :span="4" style="text-align: center;">
                   至
                 </el-col>
-                <el-col span="10">
+                <el-col :span="10">
                   <JnpfInput v-model="defaultAccountPeriod.accountPeriodUpper" :disabled="true" addonAfter="天">
                   </JnpfInput>
                 </el-col>
@@ -1469,11 +1469,11 @@ export default {
         type: "1",
         name: undefined,
         enterpriseNature: "074a2706adc84abe8832b0b6a9f20229",
-        industryClassify: undefined,
+        industryClassify: "614ecab4-845f-4cbc-9ff7-a9968aca6eeb",
         belongPeople: undefined,
         customerStarRating: "517682574965867525",
         country: "中国",
-        city: [],
+        city: ["354094489370697","354094489370698","354094489403463"],
         address: undefined,
         phone: undefined,
         companyFax: undefined,
@@ -2245,6 +2245,13 @@ export default {
         // this.encode = res.data&&res.data.encode
       })
     },
+    nameChange(e){
+      this.dataForm.accountName = e;
+      this.dataForm.enterpriseName = e;
+    },
+    registerAddressChange(e){
+      this.dataForm.workAddress = e;
+    },
     exist() {
       let isOk = true
       for (let key in this.tableRequiredData) {

jnpf-java-boot/jnpf-web/src/views/extend/service/creditrulesConfig/index.vue

@@ -175,6 +175,9 @@ export default {
       //查询生效的信用等级规则和信用规则配置
       queryDefaultCreditrating('3').then(res => {
         this.defaultCreditrating = res.data.subjectcreditratingList
+        res.data.subjectcreditratingList.forEach(item => {
+          item.annex = JSON.parse(item.annex)
+        })
       })
       queryDefaultCreditrules('3').then(res => {
         this.defaultCreditrules = res.data

jnpf-java-boot/jnpf-web/src/views/extend/service/riskConfig/index.vue

@@ -10,66 +10,66 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="压款金额" class="mt-10">
-            <el-input v-model="defaultSettlementRules.underpaymentAmountDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentAmountDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.underpaymentAmountUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentAmountUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="压款比例" class="mt-10">
-            <el-input v-model="defaultSettlementRules.underpaymentRateDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentRateDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.underpaymentRateUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentRateUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="保证金金额" class="mt-10">
-            <el-input v-model="defaultSettlementRules.marginAmountDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginAmountDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.marginAmountUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginAmountUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="保证金比例" class="mt-10">
-            <el-input v-model="defaultSettlementRules.marginRateDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginRateDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.marginRateUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginRateUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="逾期年化" class="mt-10">
-            <el-input v-model="defaultSettlementRules.overdueAnnualizedDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueAnnualizedDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.overdueAnnualizedUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueAnnualizedUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="逾期月化" class="mt-10">
-            <el-input v-model="defaultSettlementRules.overdueMonthlyDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueMonthlyDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.overdueMonthlyUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueMonthlyUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>

jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue

@@ -40,7 +40,7 @@
           <el-col :span="8" v-if="judgeShow('name')">
             <jnpf-form-tip-item label="服务商名称" v-if="judgeShow('name')" prop="name">
               <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入"
-                :disabled="judgeWrite('name')" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('name')" clearable :style='{"width":"100%"}' @input="nameChange">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -160,7 +160,7 @@
           <el-col :span="8" v-if="judgeShow('registerAddress')">
             <jnpf-form-tip-item label="注册地址" v-if="judgeShow('registerAddress')" prop="registerAddress">
               <JnpfInput v-model="dataForm.registerAddress" @change="changeData('registerAddress',-1)" placeholder="请输入"
-                :disabled="judgeWrite('registerAddress')" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('registerAddress')" clearable :style='{"width":"100%"}' @input="registerAddressChange">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -194,7 +194,7 @@
           <el-col :span="8" v-if="judgeShow('registerFunds')">
             <jnpf-form-tip-item label="注册资金" v-if="judgeShow('registerFunds')" prop="registerFunds">
               <JnpfInput v-model="dataForm.registerFunds" @change="changeData('registerFunds',-1)" placeholder="请输入"
-                :disabled="judgeWrite('registerFunds')" addonAfter="元" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('registerFunds')" addonAfter="万元" clearable :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -567,10 +567,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('advanceRatio') && dataForm.settlementMethod == 2">
-            <jnpf-form-tip-item label="预付比例" v-if="judgeShow('advanceRatio')" prop="advanceRatio">
+            <jnpf-form-tip-item label="预付比例(%)" v-if="judgeShow('advanceRatio')" prop="advanceRatio">
-              <JnpfInput v-model="dataForm.advanceRatio" @change="changeData('advanceRatio',-1)" placeholder="请输入"
+              <JnpfInputNumber v-model="dataForm.advanceRatio" @change="changeData('advanceRatio', -1)" placeholder="请输入"
-                :disabled="judgeWrite('advanceRatio')" addonAfter="%" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('advanceRatio')" addonAfter="%" clearable :style='{ "width": "100%" }' :max="Number(defaultAccountPeriod.advanceRatioUpper)" :min="Number(defaultAccountPeriod.advanceRatioDown)">
-              </JnpfInput>
+              </JnpfInputNumber>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('accountPeriod')">
@@ -1429,11 +1429,11 @@
           type: "1",
           name: undefined,
           enterpriseNature: "074a2706adc84abe8832b0b6a9f20229",
-          industryClassify: undefined,
+          industryClassify: "614ecab4-845f-4cbc-9ff7-a9968aca6eeb",
           belongPeople: undefined,
           customerStarRating: "517682574965867525",
           country: "中国",
-          city: [],
+          city: ["354094489370697","354094489370698","354094489403463"],
           address: undefined,
           phone: undefined,
           companyFax: undefined,
@@ -2193,6 +2193,13 @@
           // this.encode = res.data&&res.data.encode
         })
       },
+      nameChange(e){
+        this.dataForm.accountName = e;
+        this.dataForm.enterpriseName = e;
+      },
+      registerAddressChange(e){
+        this.dataForm.workAddress = e;
+      },
       exist() {
         let isOk = true
         for (let key in this.tableRequiredData) {

jnpf-java-boot/jnpf-web/src/views/extend/supplier/creditrulesConfig/index.vue

@@ -175,6 +175,9 @@ export default {
       //查询生效的信用等级规则和信用规则配置
       queryDefaultCreditrating('2').then(res => {
         this.defaultCreditrating = res.data.subjectcreditratingList
+        res.data.subjectcreditratingList.forEach(item => {
+          item.annex = JSON.parse(item.annex)
+        })
       })
       queryDefaultCreditrules('2').then(res => {
         this.defaultCreditrules = res.data

jnpf-java-boot/jnpf-web/src/views/extend/supplier/riskConfig/index.vue

@@ -10,66 +10,66 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="压款金额" class="mt-10">
-            <el-input v-model="defaultSettlementRules.underpaymentAmountDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentAmountDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.underpaymentAmountUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentAmountUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="压款比例" class="mt-10">
-            <el-input v-model="defaultSettlementRules.underpaymentRateDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentRateDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.underpaymentRateUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.underpaymentRateUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="保证金金额" class="mt-10">
-            <el-input v-model="defaultSettlementRules.marginAmountDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginAmountDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.marginAmountUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginAmountUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="保证金比例" class="mt-10">
-            <el-input v-model="defaultSettlementRules.marginRateDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginRateDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.marginRateUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.marginRateUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="逾期年化" class="mt-10">
-            <el-input v-model="defaultSettlementRules.overdueAnnualizedDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueAnnualizedDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.overdueAnnualizedUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueAnnualizedUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="逾期月化" class="mt-10">
-            <el-input v-model="defaultSettlementRules.overdueMonthlyDown" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueMonthlyDown" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
             <label>至</label>
-            <el-input v-model="defaultSettlementRules.overdueMonthlyUpper" placeholder="" readonly :style='{"width":"40%"}'>
+            <el-input v-model="defaultSettlementRules.overdueMonthlyUpper" placeholder="" :disabled="true" :style='{"width":"40%"}'>
               <template slot="append">%</template>
             </el-input>
           </el-form-item>

jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue

@@ -40,7 +40,7 @@
           <el-col :span="8" v-if="judgeShow('name')">
             <jnpf-form-tip-item label="供应商名称" v-if="judgeShow('name')" prop="name">
               <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入"
-                :disabled="judgeWrite('name')" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('name')" clearable :style='{"width":"100%"}' @input="nameChange">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -160,7 +160,7 @@
           <el-col :span="8" v-if="judgeShow('registerAddress')">
             <jnpf-form-tip-item label="注册地址" v-if="judgeShow('registerAddress')" prop="registerAddress">
               <JnpfInput v-model="dataForm.registerAddress" @change="changeData('registerAddress',-1)" placeholder="请输入"
-                :disabled="judgeWrite('registerAddress')" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('registerAddress')" clearable :style='{"width":"100%"}' @input="registerAddressChange">
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -194,7 +194,7 @@
           <el-col :span="8" v-if="judgeShow('registerFunds')">
             <jnpf-form-tip-item label="注册资金" v-if="judgeShow('registerFunds')" prop="registerFunds">
               <JnpfInput v-model="dataForm.registerFunds" @change="changeData('registerFunds',-1)" placeholder="请输入"
-                :disabled="judgeWrite('registerFunds')" addonAfter="元" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('registerFunds')" addonAfter="万元" clearable :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -567,10 +567,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('advanceRatio') && dataForm.settlementMethod == 2">
-            <jnpf-form-tip-item label="预付比例" v-if="judgeShow('advanceRatio')" prop="advanceRatio">
+            <jnpf-form-tip-item label="预付比例(%)" v-if="judgeShow('advanceRatio')" prop="advanceRatio">
-              <JnpfInput v-model="dataForm.advanceRatio" @change="changeData('advanceRatio',-1)" placeholder="请输入"
+              <JnpfInputNumber v-model="dataForm.advanceRatio" @change="changeData('advanceRatio', -1)" placeholder="请输入"
-                :disabled="judgeWrite('advanceRatio')" addonAfter="%" clearable :style='{"width":"100%"}'>
+                :disabled="judgeWrite('advanceRatio')" addonAfter="%" clearable :style='{ "width": "100%" }' :max="Number(defaultAccountPeriod.advanceRatioUpper)" :min="Number(defaultAccountPeriod.advanceRatioDown)">
-              </JnpfInput>
+              </JnpfInputNumber>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('accountPeriod')">
@@ -1429,11 +1429,11 @@
           type: "1",
           name: undefined,
           enterpriseNature: "074a2706adc84abe8832b0b6a9f20229",
-          industryClassify: undefined,
+          industryClassify: "614ecab4-845f-4cbc-9ff7-a9968aca6eeb",
           belongPeople: undefined,
           customerStarRating: "517682574965867525",
           country: "中国",
-          city: [],
+          city: ["354094489370697","354094489370698","354094489403463"],
           address: undefined,
           phone: undefined,
           companyFax: undefined,
@@ -2193,6 +2193,13 @@
           // this.encode = res.data&&res.data.encode
         })
       },
+      nameChange(e){
+        this.dataForm.accountName = e;
+        this.dataForm.enterpriseName = e;
+      },
+      registerAddressChange(e){
+        this.dataForm.workAddress = e;
+      },
       exist() {
         let isOk = true
         for (let key in this.tableRequiredData) {

jnpf-java-boot/jnpf-web/src/views/permission/organize/enterpriseIndex.vue

@@ -21,16 +21,30 @@
       </el-row>
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
-          <el-dropdown>
+          <div>
-            <!-- <el-button type="primary" icon="el-icon-plus">
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle('','company')">新增
-              新建<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            </el-button>
+            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'">批量删除
             </el-button> -->
+          </div>
+
+
+          <!-- <el-dropdown>
+            <el-button type="primary" icon="el-icon-plus">
+              新建<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="addOrUpdateHandle('','company')">新建公司
               </el-dropdown-item>
               <el-dropdown-item @click.native="addOrUpdateHandle()">新建部门</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
+
+
+
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="展开" placement="top">
               <el-link v-show="!expands" type="text"
@@ -67,8 +81,11 @@
           <el-table-column prop="sortCode" label="排序" width="70" align="center" />
           <el-table-column label="操作" width="200">
             <template slot-scope="scope">
-              <tableOpts @edit="addOrUpdateHandle(scope.row.id,scope.row.type,scope.row.parentId)"
+              <!-- <tableOpts @edit="addOrUpdateHandle(scope.row.id,scope.row.type,scope.row.parentId)"> -->
-                @del="handleDel(scope.row.id)">
+                <el-button type="text"
+                  @click.native="addOrUpdateHandle(scope.row.id,scope.row.type,scope.row.parentId)">编辑</el-button>
+                 <el-button type="text" v-if="scope.row.parentId != -1"
+                   @click.native="handleDel(scope.row.id)">删除</el-button>
                 <el-button type="text"
                   @click.native="openDetail(scope.row.id,scope.row.parentId)">详情</el-button>
                 <el-dropdown>
@@ -82,7 +99,7 @@
                       查看成员</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-              </tableOpts>
+              <!-- </tableOpts> -->
             </template>
           </el-table-column>
         </JNPF-table>

jnpf-java-boot/jnpf-web/src/views/permission/organize/index.vue

@@ -21,7 +21,16 @@
       </el-row>
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
-          <el-dropdown>
+          <div>
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
+            </el-button>
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            </el-button>
+            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'">批量删除
+            </el-button> -->
+          </div>
+          <!-- <el-dropdown>
             <el-button type="primary" icon="el-icon-plus">
               新建<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
@@ -30,7 +39,7 @@
               </el-dropdown-item>
               <el-dropdown-item @click.native="addOrUpdateHandle()">新建部门</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="展开" placement="top">
               <el-link v-show="!expands" type="text"
@@ -65,10 +74,17 @@
           <el-table-column prop="creatorTime" :formatter="jnpf.tableDateFormat" label="创建时间"
             width="120" />
           <el-table-column prop="sortCode" label="排序" width="70" align="center" />
-          <el-table-column label="操作" width="150">
+          <el-table-column label="操作" width="200">
             <template slot-scope="scope">
-              <tableOpts @edit="addOrUpdateHandle(scope.row.id,scope.row.type,scope.row.parentId)"
+              <!-- <tableOpts @edit="addOrUpdateHandle(scope.row.id,scope.row.type,scope.row.parentId)"
-                @del="handleDel(scope.row.id)">
+                @del="handleDel(scope.row.id)"> -->
+                <el-button type="text" v-if="scope.row.type != 'company'"
+                  @click.native="addOrUpdateHandle(scope.row.id,scope.row.type,scope.row.parentId)">编辑</el-button>
+                 <el-button type="text" v-if="scope.row.type != 'company'"
+                   @click.native="handleDel(scope.row.id)">删除</el-button>
+                <el-button type="text"
+                  @click.native="openDetail(scope.row.id,scope.row.parentId)">详情</el-button>
+
                 <el-dropdown>
                   <span class="el-dropdown-link">
                     <el-button type="text" size="mini">{{$t('common.moreBtn')}}<i
@@ -80,7 +96,7 @@
                       查看成员</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-              </tableOpts>
+              <!-- </tableOpts> -->
             </template>
           </el-table-column>
         </JNPF-table>

jnpf-java-boot/jnpf-web/src/views/permission/user/index.vue

@@ -54,8 +54,8 @@
           <topOpts @add="addOrUpdateHandle()">
             <el-button type="text" icon="el-icon-download" @click="exportForm">导出</el-button>
             <el-button type="text" icon="el-icon-upload2" @click="uploadForm">导入</el-button>
-            <el-button type="text" icon="icon-ym icon-ym-synForThird"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-synForThird"
-              @click="handleSync">第三方同步</el-button>
+              @click="handleSync">第三方同步</el-button> -->
           </topOpts>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">

jnpf-java-boot/jnpf-web/src/views/scm/bom/form.vue

@@ -1,102 +1,127 @@
 <template>
   <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
-        :disabled="setting.readonly">
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
+          <el-col :span="24">
+            <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('bomCode')">
             <jnpf-form-tip-item label="BOM编号" v-if="judgeShow('bomCode')" prop="bomCode">
-              <JnpfInput v-model="dataForm.bomCode" @change="changeData('bomCode', -1)" placeholder="系统自动生成"
+              <JnpfInput v-model="dataForm.bomCode" @change="changeData('bomCode', -1)"
-                :disabled="judgeWrite('bomCode')" readonly :style='{ "width": "100%" }'>
+                placeholder="系统自动生成" :disabled="judgeWrite('bomCode')" readonly
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('bomName')">
             <jnpf-form-tip-item label="BOM名称" v-if="judgeShow('bomName')" prop="bomName">
-              <JnpfInput v-model="dataForm.bomName" @change="changeData('bomName', -1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.bomName" @change="changeData('bomName', -1)"
-                :disabled="judgeWrite('bomName')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('bomName')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('bomNm')">
             <jnpf-form-tip-item label="BOM简称" v-if="judgeShow('bomNm')" prop="bomNm">
-              <JnpfInput v-model="dataForm.bomNm" @change="changeData('bomNm', -1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.bomNm" @change="changeData('bomNm', -1)"
-                :disabled="judgeWrite('bomNm')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('bomNm')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="加工成品" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">加工成品</span>
-            </jnpf-form-tip-item>
+            </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.bomItemList" size='mini'>
+              <el-table :data="dataForm.bomItemList" size='mini' border>
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="商品名称" v-if="judgeShow('bomitem-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('bomitem-productId')" align="center"
+                  fixed="left" prop="productId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemList-productId')">*</span>商品名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.productId" @change="productSelect" :rowIndex="scope.$index"
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="productSelect"
-                      :formData="dataForm" :templateJson="interfaceRes.bomitemproductId" placeholder="请选择"
+                      :rowIndex="scope.$index" :formData="dataForm"
-                      :disabled="judgeWrite('bomitemList') || judgeWrite('bomitemList-productId')" hasPage
+                      :templateJson="interfaceRes.bomitemproductId" placeholder="请选择"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据商品" popupType="dialog" relationField='name'
+                      :disabled="judgeWrite('bomitemList') || judgeWrite('bomitemList-productId')"
-                      :field="'productId' + scope.$index" interfaceId="519505017699307077" :pageSize="20"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据商品"
-                      :columnOptions="bomitemproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
+                      interfaceId="519505017699307077" :pageSize="20"
+                      :columnOptions="bomitemproductIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="商品规格" v-if="judgeShow('bomitem-creatorTime')" prop="creatorTime">
+                <el-table-column label="商品规格" v-if="judgeShow('bomitem-creatorTime')" align="center"
+                  prop="creatorTime">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemList-creatorTime')">*</span>商品规格
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemList-creatorTime')">*</span>商品规格
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.spec" @change="changeData('bomitem-creatorTime', scope.$index)"
+                    <JnpfInput v-model="scope.row.spec"
-                      placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
+                      @change="changeData('bomitem-creatorTime', scope.$index)" placeholder="请输入"
+                      disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="类型" v-if="judgeShow('bomitem-creatorUserId')" prop="creatorUserId">
+                <el-table-column label="类型" v-if="judgeShow('bomitem-creatorUserId')" align="center"
+                  prop="creatorUserId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemList-creatorUserId')">*</span>类型
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemList-creatorUserId')">*</span>类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.productTypeIds"
-                      @change="changeData('bomitem-creatorUserId', scope.$index)" placeholder="请输入" disabled clearable
+                      @change="changeData('bomitem-creatorUserId', scope.$index)" placeholder="请输入"
-                      :style='{ "width": "100%" }'>
+                      disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="库存单位" v-if="judgeShow('bomitem-lastModifyTime')" prop="lastModifyTime">
+                <el-table-column label="库存单位" v-if="judgeShow('bomitem-lastModifyTime')"
+                  align="center" prop="lastModifyTime">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemList-lastModifyTime')">*</span>库存单位
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemList-lastModifyTime')">*</span>库存单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryUnitIds"
-                      @change="changeData('bomitem-lastModifyTime', scope.$index)" placeholder="请输入" disabled clearable
+                      @change="changeData('bomitem-lastModifyTime', scope.$index)" placeholder="请输入"
-                      :style='{ "width": "100%" }'>
+                      disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="销售单位" v-if="judgeShow('bomitem-deleteMark')" prop="deleteMark">
+                <el-table-column label="销售单位" v-if="judgeShow('bomitem-deleteMark')" align="center"
+                  prop="deleteMark">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemList-deleteMark')">*</span>销售单位
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemList-deleteMark')">*</span>销售单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.salesMainUnitIds"
-                      @change="changeData('bomitem-deleteMark', scope.$index)" placeholder="请输入" disabled clearable
+                      @change="changeData('bomitem-deleteMark', scope.$index)" placeholder="请输入"
-                      :style='{ "width": "100%" }'>
+                      disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('bomitemList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('bomitemList')"
+                  align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delbomitemList(scope.$index)">删除</el-button>
@@ -107,131 +132,137 @@
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div> -->
 
-              <div class="table-actions" @click="choice()" v-if="!judgeWrite('bomitemList')">
+              <div class="table-actions" @click="choice()" v-if="!judgeWrite('bomitemList')"
+                align="center">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="加工原料" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">加工原料</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('bomitem-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.bomItemValueList" size='mini'>
+              <el-table :data="dataForm.bomItemValueList" size='mini' border="">
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="商品名称" v-if="judgeShow('bomitemvalue-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('bomitemvalue-productId')"
+                  align="center" fixed="left" prop="productId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemvalueList-productId')">*</span>商品名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemvalueList-productId')">*</span>商品名称
                   </template>
-
+                  <template slot-scope="scope">
-                  <!-- <template slot-scope="scope">
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="productBomSelect"
-                    <JnpfPopupSelect v-model="scope.row.productId"
-                      @change="changeData('bomitemvalue-productId',scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.bomitemvalueproductId" placeholder="请选择"
-                      :disabled="judgeWrite('bomitemvalueList')||judgeWrite('bomitemvalueList-productId')"
+                      :disabled="judgeWrite('bomitemvalueList') || judgeWrite('bomitemvalueList-productId')"
                       hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据商品"
-                      popupType="dialog" relationField='name' :field="'productId'+scope.$index"
+                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
                       interfaceId="519505017699307077" :pageSize="20"
                       :columnOptions="bomitemvalueproductIdcolumnOptions" clearable
-                      :style='{"width":"100%"}'>
+                      :style='{ "width": "100%" }'>
-                    </JnpfPopupSelect>
-                  </template> -->
-
-                  <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.productId" @change="productBomSelect" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.bomitemvalueproductId" placeholder="请选择"
-                      :disabled="judgeWrite('bomitemvalueList') || judgeWrite('bomitemvalueList-productId')" hasPage
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据商品" popupType="dialog" relationField='name'
-                      :field="'productId' + scope.$index" interfaceId="519505017699307077" :pageSize="20"
-                      :columnOptions="bomitemvalueproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
-
                     </JnpfPopupSelect>
                   </template>
 
                 </el-table-column>
-                <el-table-column label="存货类型" v-if="judgeShow('bomitemvalue-creatorTime')" prop="creatorTime">
+                <el-table-column label="存货类型" v-if="judgeShow('bomitemvalue-creatorTime')"
+                  align="center" prop="creatorTime">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemvalueList-creatorTime')">*</span>存货类型
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemvalueList-creatorTime')">*</span>存货类型
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryType" @change="productBomSelect" placeholder="请输入" disabled
+                    <JnpfInput v-model="scope.row.inventoryType" @change="productBomSelect"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" v-if="judgeShow('bomitemvalue-creatorUserId')" prop="creatorUserId">
+                <el-table-column label="规格" v-if="judgeShow('bomitemvalue-creatorUserId')"
+                  align="center" prop="creatorUserId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemvalueList-creatorUserId')">*</span>规格
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemvalueList-creatorUserId')">*</span>规格
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.spec" @change="changeData('bomitemvalue-creatorUserId', scope.$index)"
+                    <JnpfInput v-model="scope.row.spec"
+                      @change="changeData('bomitemvalue-creatorUserId', scope.$index)"
                       placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
 
                 </el-table-column>
-                <el-table-column label="库存单位" v-if="judgeShow('bomitemvalue-lastModifyUserId')" prop="lastModifyUserId">
+                <el-table-column label="库存单位" v-if="judgeShow('bomitemvalue-lastModifyUserId')"
+                  align="center" prop="lastModifyUserId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemvalueList-lastModifyUserId')">*</span>库存单位
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemvalueList-lastModifyUserId')">*</span>库存单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryUnitIds"
-                      @change="changeData('bomitemvalue-lastModifyUserId', scope.$index)" placeholder="请输入" disabled
+                      @change="changeData('bomitemvalue-lastModifyUserId', scope.$index)"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="条码" v-if="judgeShow('bomitemvalue-deleteUserId')" prop="deleteUserId">
+                <el-table-column label="条码" v-if="judgeShow('bomitemvalue-deleteUserId')"
+                  align="center" prop="deleteUserId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemvalueList-deleteUserId')">*</span>条码
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemvalueList-deleteUserId')">*</span>条码
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.barCode"
-                      @change="changeData('bomitemvalue-deleteUserId', scope.$index)" placeholder="请输入" disabled
+                      @change="changeData('bomitemvalue-deleteUserId', scope.$index)"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作单位" v-if="judgeShow('bomitemvalue-unit')" prop="unit">
+                <el-table-column label="操作单位" v-if="judgeShow('bomitemvalue-unit')" prop="unit"
+                  align="center">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemvalueList-unit')">*</span>操作单位
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemvalueList-unit')">*</span>操作单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.operateUnitIds"
-                      @change="changeData('bomitemvalue-unit', scope.$index)" placeholder="请输入" disabled clearable
+                      @change="changeData('bomitemvalue-unit', scope.$index)" placeholder="请输入"
-                      :style='{ "width": "100%" }'>
+                      disabled clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="比例数量" v-if="judgeShow('bomitemvalue-proportionNum')" prop="proportionNum">
+                <el-table-column label="比例数量" v-if="judgeShow('bomitemvalue-proportionNum')"
+                  align="center" prop="proportionNum">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('bomitemvalueList-proportionNum')">*</span>比例数量
+                    <span class="required-sign"
+                      v-if="judgeRequired('bomitemvalueList-proportionNum')">*</span>比例数量
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.proportionNum"
-                      @change="changeData('bomitemvalue-proportionNum', scope.$index)" placeholder="请输入"
+                      @change="changeData('bomitemvalue-proportionNum', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('bomitemvalueList') || judgeWrite('bomitemvalueList-proportionNum')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('bomitemvalueList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('bomitemvalueList')"
+                  align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delbomitemvalueList(scope.$index)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
-              <div class="table-actions" @click="choiceRaw()" v-if="!judgeWrite('bomitemvalueList')">
+              <div class="table-actions" @click="choiceRaw()"
+                v-if="!judgeWrite('bomitemvalueList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
               <!-- <div class="table-actions" @click="addbomitemvalueList()">
@@ -242,14 +273,15 @@
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
 
     <BomProductGoodsBox v-if="BomgoodsBoxVisible" ref="BomGoodsBox" @refreshDataList="initList" />
-    <BomProductRawGoodsBox v-if="BomgoodsBoxRawVisible" ref="BomGoodsRawBox" @refreshDataList="initRawList" />
+    <BomProductRawGoodsBox v-if="BomgoodsBoxRawVisible" ref="BomGoodsRawBox"
+      @refreshDataList="initRawList" />
   </div>
 
 </template>
@@ -550,15 +582,15 @@ export default {
       let isOk = true;
       for (let i = 0; i < this.dataForm.bomItemValueList.length; i++) {
         const e = this.dataForm.bomItemValueList[i];
-        if (!e.unit) {
+        // if (!e.unit) {
-          this.$message({
+        //   this.$message({
-            message: '操作单位不能为空',
+        //     message: '操作单位不能为空',
-            type: 'error',
+        //     type: 'error',
-            duration: 1000
+        //     duration: 1000
-          });
+        //   });
-          isOk = false
+        //   isOk = false
-          break
+        //   break
-        }
+        // }
         if (!e.proportionNum) {
           this.$message({
             message: '比例数量不能为空',

jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue

@@ -80,9 +80,7 @@
                 <el-col>
                   {{ scope.row.bomCode }}
                 </el-col>
-                <el-col>
+              
-                  {{ scope.row.bomName }}
-                </el-col>
               </el-row>
             </template>
 
@@ -91,9 +89,7 @@
           <el-table-column prop="bomName" label="商品名称" align="center" min-width="120" fixed="left" sortable>
             <template #default="scope">
               <el-row>
-                <el-col>
+              
-                  {{ scope.row.productCode }}
-                </el-col>
                 <el-col>
                   {{ scope.row.productName }}
                 </el-col>
@@ -120,10 +116,7 @@
           </el-table-column>
           <el-table-column prop="categoryName" label="商品分类" align="center" min-width="120">
           </el-table-column>
-          <!-- <el-table-column prop="bomCode" label="商品类目" align="left" min-width="120">
+ 
-          </el-table-column>
-          <el-table-column prop="bomCode" label="尺寸单位" align="left" min-width="120">
-          </el-table-column> -->
 
           <el-table-column prop="flowState" label="状态" width="100" align="center">
             <template slot-scope="scope" v-if="!scope.row.top">

jnpf-java-boot/jnpf-web/src/views/scm/businessline1/form.vue

@@ -1,21 +1,16 @@
 
-
-div -1 
--2
-
     <template>
   <div :style="{margin: '0 auto',width:'100%'}">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="default" label-width="100px"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
-        label-position="left" :disabled="setting.readonly">
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="基础信息11" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
-              </JnpfGroupTitle>
+            </div>
-            </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('code')">
             <jnpf-form-tip-item label="生产线编号" v-if="judgeShow('code')" prop="code">
@@ -82,20 +77,20 @@ div -1
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="联系人信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">联系人信息</span>
-            </jnpf-form-tip-item>
+            </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.businessContact1List" size='mini'>
+              <el-table :data="dataForm.businessContact1List" size='mini' border="">
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                 <el-table-column label="类型" v-if="judgeShow('businesscontact1-contactType')"
-                  prop="contactType">
+                  align="center" fixed="left" prop="contactType">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontactList-contactType')">*</span>类型
@@ -111,7 +106,8 @@ div -1
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name">
+                <el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name"
+                  align="center" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontactList-name')">*</span>姓名
@@ -125,7 +121,7 @@ div -1
                   </template>
                 </el-table-column>
                 <el-table-column label="手机号" v-if="judgeShow('businesscontact1-phone')"
-                  prop="phone">
+                  align="center" prop="phone">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontactList-phone')">*</span>手机号
@@ -139,7 +135,7 @@ div -1
                   </template>
                 </el-table-column>
                 <el-table-column label="座机" v-if="judgeShow('businesscontact1-landline')"
-                  prop="landline">
+                  align="center" prop="landline">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontactList-landline')">*</span>座机
@@ -153,7 +149,8 @@ div -1
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="邮箱" v-if="judgeShow('businesscontact1-email')" prop="email">
+                <el-table-column label="邮箱" v-if="judgeShow('businesscontact1-email')" prop="email"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontactList-email')">*</span>邮箱
@@ -166,7 +163,8 @@ div -1
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="传真" v-if="judgeShow('businesscontact1-fax')" prop="fax">
+                <el-table-column label="传真" v-if="judgeShow('businesscontact1-fax')" prop="fax"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontactList-fax')">*</span>传真
@@ -180,7 +178,7 @@ div -1
                   </template>
                 </el-table-column>
                 <el-table-column label="更新时间" v-if="judgeShow('businesscontact1-lastModifyTime')"
-                  prop="lastModifyTime">
+                  align="center" prop="lastModifyTime">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontactList-lastModifyTime')">*</span>更新时间
@@ -194,7 +192,8 @@ div -1
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('businesscontactList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('businesscontactList')"
+                  align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delbusinessContact1List(scope.$index)">删除</el-button>

jnpf-java-boot/jnpf-web/src/views/scm/businessline2/form.vue

@@ -6,15 +6,15 @@
   <div :style="{margin: '0 auto',width:'100%'}">
 
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="default" label-width="100px"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
-        label-position="left" :disabled="setting.readonly">
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('code')">
             <jnpf-form-tip-item label="车间编号" v-if="judgeShow('code')" prop="code">
@@ -81,20 +81,20 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="联系人信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">联系人信息</span>
-            </jnpf-form-tip-item>
+            </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.businessContact1List" size='mini'>
+              <el-table :data="dataForm.businessContact1List" size='mini' border="">
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                 <el-table-column label="类型" v-if="judgeShow('businesscontact1-contactType')"
-                  prop="contactType">
+                  align="center" fixed="left" prop="contactType">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontact1List-contactType')">*</span>类型
@@ -110,7 +110,8 @@
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name">
+                <el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontact1List-name')">*</span>姓名
@@ -124,7 +125,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="手机号" v-if="judgeShow('businesscontact1-phone')"
-                  prop="phone">
+                  align="center" prop="phone">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontact1List-phone')">*</span>手机号
@@ -138,7 +139,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="座机" v-if="judgeShow('businesscontact1-landline')"
-                  prop="landline">
+                  align="center" prop="landline">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontact1List-landline')">*</span>座机
@@ -152,7 +153,8 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="邮箱" v-if="judgeShow('businesscontact1-email')" prop="email">
+                <el-table-column label="邮箱" v-if="judgeShow('businesscontact1-email')" prop="email"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontact1List-email')">*</span>邮箱
@@ -165,7 +167,8 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="传真" v-if="judgeShow('businesscontact1-fax')" prop="fax">
+                <el-table-column label="传真" v-if="judgeShow('businesscontact1-fax')" prop="fax"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontact1List-fax')">*</span>传真
@@ -179,7 +182,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="更新时间" v-if="judgeShow('businesscontact1-lastModifyTime')"
-                  prop="lastModifyTime">
+                  align="center" prop="lastModifyTime">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('businesscontact1List-lastModifyTime')">*</span>更新时间
@@ -193,7 +196,8 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('businesscontact1List')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('businesscontact1List')"
+                  align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delbusinesscontact1List(scope.$index)">删除</el-button>

jnpf-java-boot/jnpf-web/src/views/scm/classplan/form.vue

@@ -1,35 +1,35 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+  <el-dialog :title="!dataForm.id ? '新建排班' : '编辑排班'" :close-on-click-modal="false" append-to-body
-    class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
         label-position="right">
         <template v-if="!loading">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="8">
-            <jnpf-form-tip-item label="计划编号" prop="timeCode">
+            <jnpf-form-tip-item label="排班计划编号" prop="timeCode">
-              <JnpfInput v-model="dataForm.timeCode" @change="changeData('timeCode', -1)" placeholder="系统自动生成" readonly
+              <JnpfInput v-model="dataForm.timeCode" @change="changeData('timeCode', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="系统自动生成" readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
-            <jnpf-form-tip-item label="计划名称" prop="timeName">
+            <jnpf-form-tip-item label="排班计划名称" prop="timeName">
-              <JnpfInput v-model="dataForm.timeName" @change="changeData('timeName', -1)" placeholder="请输入" clearable
+              <JnpfInput v-model="dataForm.timeName" @change="changeData('timeName', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="简称/英文名" prop="timeNm">
-              <JnpfInput v-model="dataForm.timeNm" @change="changeData('timeNm', -1)" placeholder="请输入" clearable
+              <JnpfInput v-model="dataForm.timeNm" @change="changeData('timeNm', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -37,15 +37,16 @@
           <el-col :span="8">
             <jnpf-form-tip-item label="有效时间" prop="startTime">
               <JnpfDatePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
+                placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
+                format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="4">
             <jnpf-form-tip-item>
               <JnpfText
-                :textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 19, "line-height": 32, "font-style": "normal", "text-align": "left" }'
+                :textStyle='{  "font-weight": "normal", "text-decoration": "none", "font-size": 15, "line-height": 28, "font-style": "normal", "text-align": "left" }'
                 content="至">
               </JnpfText>
             </jnpf-form-tip-item>
@@ -54,91 +55,103 @@
           <el-col :span="8">
             <jnpf-form-tip-item label="结束时间" prop="endTime">
               <JnpfDatePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
+                placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
+                format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item label="计划状态" prop="timeStatus">
+            <jnpf-form-tip-item label="排班状态" prop="timeStatus">
-              <JnpfRadio v-model="dataForm.timeStatus" @change="changeData('timeStatus', -1)" optionType="button"
+              <JnpfRadio v-model="dataForm.timeStatus" @change="changeData('timeStatus', -1)"
-                direction="horizontal" size="medium" :options="timeStatusOptions" :props="timeStatusProps">
+                optionType="button" direction="horizontal" size="medium"
+                :options="timeStatusOptions" :props="timeStatusProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label="描述" prop="remark">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入" clearable
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="计划配置" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">排班计划配置</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
             <jnpf-form-tip-item label="倒班方式" prop="shiftMethod">
-              <JnpfSelect v-model="dataForm.shiftMethod" @change="changeData('shiftMethod', -1)" placeholder="请选择"
+              <JnpfSelect v-model="dataForm.shiftMethod" @change="changeData('shiftMethod', -1)"
-                clearable :style='{ "width": "100%" }' :options="shiftMethodOptions" :props="shiftMethodProps">
+                placeholder="请选择" clearable :style='{ "width": "100%" }'
+                :options="shiftMethodOptions" :props="shiftMethodProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
+
           <el-col :span="24">
             <jnpf-form-tip-item label-width="0">
-              <div class="JNPF-common-title">
+              <el-col :span="24">
-                <h2>班次列表</h2>
+                <div style="padding:15px 0px">
-              </div>
+                  <span style="color: #409EFF;">▋</span>
-              <el-table :data="dataForm.classPlanItemList" size='mini'>
+                  <span
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                    style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">班次列表</span>
-                <el-table-column label="班次名称" prop="timeId">
+                </div>
+              </el-col>
+              <el-table :data="dataForm.classPlanItemList" size='mini' border="">
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                <el-table-column label="班次名称" prop="timeId" align="center" fixed="left">
                   <template slot="header" v-if="true">
                     <span class="required-sign">*</span>班次名称
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.timeId" @change="changeDataTimeList" :rowIndex="scope.$index"
+                    <JnpfPopupSelect v-model="scope.row.timeId" @change="changeDataTimeList"
-                      :formData="dataForm" :templateJson="interfaceRes.classplanitemtimeId" placeholder="请选择" hasPage
+                      :rowIndex="scope.$index" :formData="dataForm"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='time_name'
+                      :templateJson="interfaceRes.classplanitemtimeId" placeholder="请选择" hasPage
-                      :field="'timeId' + scope.$index" interfaceId="523033213203919429" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      :columnOptions="classplanitemtimeIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                      relationField='time_name' :field="'timeId' + scope.$index"
+                      interfaceId="523033213203919429" :pageSize="20"
+                      :columnOptions="classplanitemtimeIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="开始时间" prop="startTimeMin">
+                <el-table-column label="开始时间" prop="startTimeMin" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>开始时间
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.startTimeMin"
-                      @change="changeData('classplanitem-creatorTime', scope.$index)" disabled placeholder="请输入"
+                      @change="changeData('classplanitem-creatorTime', scope.$index)" disabled
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="结束时间" prop="endTimeMin">
+                <el-table-column label="结束时间" prop="endTimeMin" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>结束时间
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.endTimeMin"
-                      @change="changeData('classplanitem-creatorUserId', scope.$index)" disabled placeholder="请输入"
+                      @change="changeData('classplanitem-creatorUserId', scope.$index)" disabled
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" prop="remark">
+                <el-table-column label="备注" prop="remark" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>备注
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.remark" @change="changeData('classplanitem-remark', scope.$index)"
+                    <JnpfInput v-model="scope.row.remark"
-                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('classplanitem-remark', scope.$index)" placeholder="请输入"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50">
+                <el-table-column label="操作" width="50" align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delclassplanitemList(scope.$index)">删除</el-button>
@@ -155,73 +168,43 @@
 
             </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 label-width="0">
-              <div class="JNPF-common-title">
+              <el-col :span="24">
-                <h2>班组列表</h2>
+                <div style="padding:15px 0px">
-              </div>
+                  <span style="color: #409EFF;">▋</span>
-              <el-table :data="dataForm.classPlanTeamList" size='mini'>
+                  <span
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                    style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">班组列表</span>
-                <el-table-column label="班组名称" prop="teamId">
+                </div>
+              </el-col>
+              <el-table :data="dataForm.classPlanTeamList" size='mini' border="">
+                <el-table-column type="index" width="50" label="序号" align="center" filters="left" />
+                <el-table-column label="班组名称" prop="teamId" align="center" filters="left">
                   <template slot="header" v-if="true">
                     <span class="required-sign">*</span>班组名称
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.teamId" @change="changeDataList" :rowIndex="scope.$index"
+                    <JnpfPopupSelect v-model="scope.row.teamId" @change="changeDataList"
-                      :formData="dataForm" :templateJson="interfaceRes.classplanteamteamId" placeholder="请选择" hasPage
+                      :rowIndex="scope.$index" :formData="dataForm"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='team_name'
+                      :templateJson="interfaceRes.classplanteamteamId" placeholder="请选择" hasPage
-                      :field="'teamId' + scope.$index" interfaceId="523050983727575621" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      :columnOptions="classplanteamteamIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                      relationField='team_name' :field="'teamId' + scope.$index"
+                      interfaceId="523050983727575621" :pageSize="20"
+                      :columnOptions="classplanteamteamIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <!-- <el-table-column label="类型" prop="types">
-                  <template slot="header" v-if="false">
-                    <span class="required-sign">*</span>类型
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.types" @change="changeData('classplanteam-deleteTime', scope.$index)"
-                      disabled placeholder="请输入" clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
-                <!-- <el-table-column label="负责人" prop="fRealName">
-                  <template slot="header" v-if="false">
-                    <span class="required-sign">*</span>负责人
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.fRealName"
-                      @change="changeData('classplanteam-creatorTime', scope.$index)" disabled placeholder="请输入"
-                      clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
-
-                <!-- <el-table-column label="联系手机" prop="fMobilePhone">
-                  <template slot="header" v-if="false">
-                    <span class="required-sign">*</span>联系手机
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.fMobilePhone"
-                      @change="changeData('classplanteam-creatorTime', scope.$index)" disabled placeholder="请输入"
-                      clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
 
-                <el-table-column label="备注" prop="remark">
+                <el-table-column label="备注" prop="remark" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>备注
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.remark" @change="changeData('classplanteam-remark', scope.$index)"
+                    <JnpfInput v-model="scope.row.remark"
-                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('classplanteam-remark', scope.$index)" placeholder="请输入"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -245,8 +228,8 @@
           <!-- 表单结束 -->
         </template>
       </el-form>
-      <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+      <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-        @select="addForSelect" @close="selectDialogVisible = false" />
+        ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
     </el-row>
     <span slot="footer" class="dialog-footer">
       <div class="upAndDown-button" v-if="dataForm.id">
@@ -264,7 +247,8 @@
     </span>
 
     <ClassTeamGoodsBox v-if="classTeamVisible" ref="classTeamBox" @refreshDataList="initList" />
-    <ClassTimeGoodsBox v-if="classTimeVisible" ref="classTimeBox" @refreshDataList="classTimeList" />
+    <ClassTimeGoodsBox v-if="classTimeVisible" ref="classTimeBox"
+      @refreshDataList="classTimeList" />
   </el-dialog>
 </template>
 

jnpf-java-boot/jnpf-web/src/views/scm/classplan/index.vue

@@ -4,12 +4,12 @@
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
-            <el-form-item label="计划名称">
+            <el-form-item label="排班计划名称">
               <el-input v-model="query.timeName" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划状态">
+            <el-form-item label="排班计划状态">
               <JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable :options="timeStatusOptions"
                 :props="timeStatusProps">
               </JnpfSelect>
@@ -53,9 +53,9 @@
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
           @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="timeName" label="计划名称" align="center" fixed="left" sortable>
+          <el-table-column prop="timeName" label="排班计划名称" align="center" fixed="left" sortable>
           </el-table-column>
-          <el-table-column prop="timeCode" label="计划编号" align="center" fixed="left" sortable>
+          <el-table-column prop="timeCode" label="排班计划编号" align="center" fixed="left" sortable>
           </el-table-column>
           <el-table-column prop="startTime" label="有效时间(开始)" align="center">
           </el-table-column>

jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue

@@ -1,158 +1,167 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+  <el-dialog :title="!dataForm.id ? '新建班组' : '编辑班组'" :close-on-click-modal="false" append-to-body
-    class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
         label-position="right">
         <template v-if="!loading">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="班组编号" prop="teamCode">
-              <JnpfInput v-model="dataForm.teamCode" @change="changeData('teamCode', -1)" placeholder="系统自动生成" readonly
+              <JnpfInput v-model="dataForm.teamCode" @change="changeData('teamCode', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="系统自动生成" readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="班组名称" prop="teamName">
-              <JnpfInput v-model="dataForm.teamName" @change="changeData('teamName', -1)" placeholder="请输入" clearable
+              <JnpfInput v-model="dataForm.teamName" @change="changeData('teamName', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="班组简称" prop="teamNm">
-              <JnpfInput v-model="dataForm.teamNm" @change="changeData('teamNm', -1)" placeholder="请输入" clearable
+              <JnpfInput v-model="dataForm.teamNm" @change="changeData('teamNm', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="类型" prop="type">
-              <JnpfSelect v-model="dataForm.type" @change="changeData('type', -1)" placeholder="请选择" clearable
+              <JnpfSelect v-model="dataForm.type" @change="changeData('type', -1)" placeholder="请选择"
-                :style='{ "width": "100%" }' :options="typeOptions" :props="typeProps">
+                clearable :style='{ "width": "100%" }' :options="typeOptions" :props="typeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="所属工厂" prop="parentId">
-              <JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId', -1)" placeholder="请选择" clearable
+              <JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId', -1)"
-                :style='{ "width": "100%" }' :options="parentIdOptions" :props="parentIdProps">
+                placeholder="请选择" clearable :style='{ "width": "100%" }' :options="parentIdOptions"
+                :props="parentIdProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="所属车间" prop="parentIds">
-              <JnpfSelect v-model="dataForm.parentIds" @change="changeData('parentIds', -1)" placeholder="请选择" clearable
+              <JnpfSelect v-model="dataForm.parentIds" @change="changeData('parentIds', -1)"
-                :style='{ "width": "100%" }' :options="parentIdsOptions" :props="parentIdsProps">
+                placeholder="请选择" clearable :style='{ "width": "100%" }' :options="parentIdsOptions"
+                :props="parentIdsProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="12">
             <jnpf-form-tip-item label="班组状态" prop="teamStatus">
-              <JnpfRadio v-model="dataForm.teamStatus" @change="changeData('teamStatus', -1)" optionType="default"
+              <JnpfRadio v-model="dataForm.teamStatus" @change="changeData('teamStatus', -1)"
-                direction="horizontal" size="medium" :options="teamStatusOptions" :props="teamStatusProps">
+                optionType="default" direction="horizontal" size="medium"
+                :options="teamStatusOptions" :props="teamStatusProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label="描述" prop="remark">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入" clearable
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)"
-                :style='{ "width": "100%" }'>
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="联系人信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">联系人信息</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label-width="0">
-              <el-table :data="dataForm.businessContactTeamList" size='mini'>
+              <el-table :data="dataForm.businessContactTeamList" size='mini' border="">
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="联系人类型" prop="contactType">
+                <el-table-column label="联系人类型" prop="contactType" width="150px" align="center"
+                  fixed="left">
                   <template slot="header" v-if="true">
                     <span class="required-sign">*</span>联系人类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.contactType"
-                      @change="changeData('businesscontactteam-contactType', scope.$index)" placeholder="请选择" clearable
+                      @change="changeData('businesscontactteam-contactType', scope.$index)"
-                      :style='{ "width": "100%" }' :options="businesscontactteamcontactTypeOptions"
+                      placeholder="请选择" clearable :style='{ "width": "100%" }'
+                      :options="businesscontactteamcontactTypeOptions"
                       :props="businesscontactteamcontactTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="姓名" prop="name">
+                <el-table-column label="姓名" prop="name" width="150px" align="center" fixed="left">
                   <template slot="header" v-if="true">
                     <span class="required-sign">*</span>姓名
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.name" @change="changeData('businesscontactteam-name', scope.$index)"
+                    <JnpfInput v-model="scope.row.name"
+                      @change="changeData('businesscontactteam-name', scope.$index)"
                       placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="手机号" prop="phone">
+                <el-table-column label="手机号" prop="phone" width="200px" align="center">
                   <template slot="header" v-if="true">
                     <span class="required-sign">*</span>手机号
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.phone" @change="changeData('businesscontactteam-phone', scope.$index)"
+                    <JnpfInput v-model="scope.row.phone"
+                      @change="changeData('businesscontactteam-phone', scope.$index)"
                       placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="座机" prop="landline">
+                <el-table-column label="座机" prop="landline" width="200px" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>座机
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.landline"
-                      @change="changeData('businesscontactteam-landline', scope.$index)" placeholder="请输入" clearable
+                      @change="changeData('businesscontactteam-landline', scope.$index)"
-                      :style='{ "width": "100%" }'>
+                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="邮箱" prop="email">
+                <el-table-column label="邮箱" prop="email" width="200px" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>邮箱
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.email" @change="changeData('businesscontactteam-email', scope.$index)"
+                    <JnpfInput v-model="scope.row.email"
+                      @change="changeData('businesscontactteam-email', scope.$index)"
                       placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="传真" prop="fax">
+                <el-table-column label="传真" prop="fax" width="200px" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>传真
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.fax" @change="changeData('businesscontactteam-fax', scope.$index)"
+                    <JnpfInput v-model="scope.row.fax"
+                      @change="changeData('businesscontactteam-fax', scope.$index)"
                       placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="修改时间" prop="lastModifyTime">
+                <el-table-column label="修改时间" prop="lastModifyTime" width="200px" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>修改时间
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.lastModifyTime"
-                      @change="changeData('businesscontactteam-lastModifyTime', scope.$index)" placeholder="请输入"
+                      @change="changeData('businesscontactteam-lastModifyTime', scope.$index)"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50">
+                <el-table-column label="操作" width="50" align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delbusinesscontactteamList(scope.$index)">删除</el-button>
@@ -165,37 +174,30 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="班组人员" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">班组人员</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label-width="0">
-              <el-table :data="dataForm.classTeamUseList" size='mini'>
+              <el-table :data="dataForm.classTeamUseList" size='mini' border="">
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="员工姓名" prop="belongUserId">
+                <el-table-column label="员工姓名" prop="belongUserId" align="center">
                   <template slot="header" v-if="false">
                     <span class="required-sign">*</span>员工姓名
                   </template>
-                  <!-- <template slot-scope="scope">
-                    <JnpfUserSelect v-model="scope.row.belongUserId"
-                      @change="changeData('classteamuse-belongUserId',scope.$index)"
 
+                  <template slot-scope="scope">
+                    <JnpfUserSelect v-model="scope.row.belongUserId" @change="changeDataList"
                       placeholder="请选择" selectType="all"
                       :ableIds="ableAll.classteamusebelongUserIdableIds" clearable
-                      :style='{"width":"100%"}'>
-                    </JnpfUserSelect>
-                  </template> -->
-                  <template slot-scope="scope">
-                    <JnpfUserSelect v-model="scope.row.belongUserId" @change="changeDataList" placeholder="请选择"
-                      selectType="all" :ableIds="ableAll.classteamusebelongUserIdableIds" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfUserSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="手机" prop="mobilePhone">
+                <el-table-column label="手机" prop="mobilePhone" align="center">
                   <template slot="header">
                     <span class="required-sign">*</span>手机
                   </template>
@@ -206,7 +208,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="组织部门" prop="organize">
+                <el-table-column label="组织部门" prop="organize" align="center">
                   <template slot="header">
                     <span class="required-sign">*</span>组织部门
                   </template>
@@ -217,7 +219,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50">
+                <el-table-column label="操作" width="50" align="center">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delclassteamuseList(scope.$index)">删除</el-button>
@@ -232,8 +234,8 @@
           <!-- 表单结束 -->
         </template>
       </el-form>
-      <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+      <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-        @select="addForSelect" @close="selectDialogVisible = false" />
+        ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
     </el-row>
     <span slot="footer" class="dialog-footer">
       <div class="upAndDown-button" v-if="dataForm.id">

jnpf-java-boot/jnpf-web/src/views/scm/classtime/form.vue

@@ -2,7 +2,7 @@
 
 
     <template>
-  <el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body
+  <el-dialog :title="!dataForm.id ? '新建班次' :'编辑班次'" :close-on-click-modal="false" append-to-body
     :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
       <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
@@ -10,28 +10,28 @@
         <template v-if="!loading">
           <!-- 具体表单 -->
           <el-col :span="8">
-            <jnpf-form-tip-item label="班组编号" prop="timeCode">
+            <jnpf-form-tip-item label="班次编号" prop="timeCode">
               <JnpfInput v-model="dataForm.timeCode" @change="changeData('timeCode',-1)"
                 placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
-            <jnpf-form-tip-item label="班组名称" prop="timeName">
+            <jnpf-form-tip-item label="班次名称" prop="timeName">
               <JnpfInput v-model="dataForm.timeName" @change="changeData('timeName',-1)"
                 placeholder="请输入" clearable :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8">
-            <jnpf-form-tip-item label="班组简称" prop="timeNm">
+            <jnpf-form-tip-item label="班次简称" prop="timeNm">
               <JnpfInput v-model="dataForm.timeNm" @change="changeData('timeNm',-1)"
                 placeholder="请输入" clearable :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
 
-          <el-col :span="10">
+          <el-col :span="8">
             <jnpf-form-tip-item label="开始时间" prop="startTime">
               <JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime',-1)"
                 :startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')"
@@ -40,7 +40,7 @@
             </jnpf-form-tip-item>
           </el-col>
 
-          <el-col :span="10">
+          <el-col :span="8">
             <jnpf-form-tip-item label="结束时间" prop="endTime">
               <JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime',-1)"
                 :startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')"

jnpf-java-boot/jnpf-web/src/views/scm/classtime/index.vue

@@ -4,12 +4,12 @@
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
           <el-col :span="6">
-            <el-form-item label="班组编号">
+            <el-form-item label="班次编号">
               <el-input v-model="query.timeCode" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="班组名称">
+            <el-form-item label="班次名称">
               <el-input v-model="query.timeName" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
@@ -51,12 +51,12 @@
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
           @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="timeCode" label="班组编号" align="center" sortable fixed="left">
+          <el-table-column prop="timeCode" label="班次编号" align="center" sortable fixed="left">
           </el-table-column>
-          <el-table-column prop="timeName" label="班组名称" align="center" sortable fixed="left">
+          <el-table-column prop="timeName" label="班次名称" align="center" sortable fixed="left">
           </el-table-column>
 
-          <el-table-column prop="timeNm" label="班组简称" align="center" sortable>
+          <el-table-column prop="timeNm" label="班次简称" align="center" sortable>
           </el-table-column>
 
           <el-table-column prop="startTime" label="开始时间" align="center" sortable>

jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue

@@ -1160,6 +1160,7 @@ 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 dayjs from 'dayjs'
 export default {
     mixins: [comMixin],
     components: {},
@@ -1284,10 +1285,10 @@ export default {
                 contractNumber: undefined,
                 contractName: undefined,
                 contractNo: undefined,
-                contractSignedTime: undefined,
+                contractSignedTime: dayjs().valueOf(),
                 businessId: undefined,
-                contractPeriodTime: undefined,
+                contractPeriodTime: dayjs().valueOf(),
-                contractPeriodTimeEnd: undefined,
+                contractPeriodTimeEnd: dayjs().add(1,'year').valueOf(),
                 deptId: [],
                 subject: "522407918746741061",
                 procurementModel: undefined,
@@ -1338,6 +1339,13 @@ export default {
                         trigger: 'change'
                     },
                 ],
+                businessId: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
                 procurementModel: [
                     {
                         required: true,

jnpf-java-boot/jnpf-web/src/views/scm/contractLMonitor/index.vue

@@ -80,9 +80,9 @@
       </el-row>
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
-          <div>
+          <!-- <div>
             <el-button type="danger" @click="handleDel" icon="el-icon-delete">删除</el-button>
-          </div>
+          </div> -->
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
               <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />

jnpf-java-boot/jnpf-web/src/views/scm/energyconsumption/form.vue

@@ -5,7 +5,7 @@
     <template>
   <div :style="{margin: '0 auto',width:'100%'}">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
         label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
@@ -49,7 +49,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24" v-if="judgeShow('remark')">
+          <el-col :span="16" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
               <JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
                 placeholder="请输入" :disabled="judgeWrite('remark')" clearable

jnpf-java-boot/jnpf-web/src/views/scm/processclassification/Detail.vue

@@ -1,105 +1,101 @@
 <template>
-<el-dialog title="详情"
+  <el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
-           :close-on-click-modal="false" append-to-body
+    class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
+    <el-row :gutter="15" class="">
-           width="600px">
+      <el-form ref="formRef" :model="dataForm" size="small" label-width="120px"
-<el-row :gutter="15" class="">
+        label-position="right">
-<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
+        <template v-if="!loading">
-    <template v-if="!loading">
+          <el-col :span="12">
-            <el-col :span="12"  >
+            <jnpf-form-tip-item label="工序分类编码" prop="categoryCode">
-                <jnpf-form-tip-item  label="工序分类编码"  
+              <p>{{dataForm.categoryCode}}</p>
- prop="categoryCode"  >
+            </jnpf-form-tip-item>
-                        <p>{{dataForm.categoryCode}}</p>
+          </el-col>
-                </jnpf-form-tip-item>
+          <el-col :span="12">
-            </el-col>
+            <jnpf-form-tip-item label="工序分类名称" prop="categoryName">
-            <el-col :span="12"  >
+              <p>{{dataForm.categoryName}}</p>
-                <jnpf-form-tip-item  label="工序分类名称"  
+            </jnpf-form-tip-item>
- prop="categoryName"  >
+          </el-col>
-                        <p>{{dataForm.categoryName}}</p>
+          <el-col :span="24">
-                </jnpf-form-tip-item>
+            <jnpf-form-tip-item label="工序分类描述" prop="categoryDescription">
-            </el-col>
+              <p>{{dataForm.categoryDescription}}</p>
-            <el-col :span="24"  >
+            </jnpf-form-tip-item>
-                <jnpf-form-tip-item  label="工序分类描述"  
+          </el-col>
- prop="categoryDescription"  >
+        </template>
-                        <p>{{dataForm.categoryDescription}}</p>
+      </el-form>
-                </jnpf-form-tip-item>
-            </el-col>
-    </template>
-</el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
+      <el-button @click="visible = false"> 取 消</el-button>
     </span>
     <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from '@/utils/request'
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
+import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
+import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
+import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
+import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
+export default {
-        components: { Detail},
+  components: { Detail },
-        props: [],
+  props: [],
-        data() {
+  data() {
-            return {
+    return {
-                visible: false,
+      visible: false,
-                detailVisible: false,
+      detailVisible: false,
-                loading: false,
+      loading: false,
 
-            dataForm: {
+      dataForm: {
-                id :'',
+        id: '',
-                            categoryCode : '',
+        categoryCode: '',
-                            categoryName : '',
+        categoryName: '',
-                            categoryDescription : '',
+        categoryDescription: '',
-            },
+      },
 
-        }
+    }
-        },
+  },
-        computed: {},
+  computed: {},
-        watch: {},
+  watch: {},
-        created() {
+  created() {
 
-        },
+  },
-        mounted() {},
+  mounted() { },
-        methods: {
+  methods: {
-            toDetail(defaultValue, modelId) {
+    toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
+      if (!defaultValue) return
-                getConfigData(modelId).then(res => {
+      getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
+        if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
+        let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
+        formData.popupType = 'general'
-                    this.detailVisible = true
+        this.detailVisible = true
-                    this.$nextTick(() => {
+        this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
+          this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
+        })
-                })
+      })
-            },
+    },
-            dataInfo(dataAll){
+    dataInfo(dataAll) {
-                let _dataAll =dataAll
+      let _dataAll = dataAll
-                this.dataForm = _dataAll
+      this.dataForm = _dataAll
-            },
+    },
 
-            init(id) {
+    init(id) {
-                this.dataForm.id = id || 0;
+      this.dataForm.id = id || 0;
-                this.visible = true;
+      this.visible = true;
-                this.$nextTick(() => {
+      this.$nextTick(() => {
-                    if(this.dataForm.id){
+        if (this.dataForm.id) {
-                        this.loading = true
+          this.loading = true
-                        request({
+          request({
-                            url: '/api/scm/ProcessClassification/detail/'+this.dataForm.id,
+            url: '/api/scm/ProcessClassification/detail/' + this.dataForm.id,
-                            method: 'get'
+            method: 'get'
-                        }).then(res => {
+          }).then(res => {
-                            this.dataInfo(res.data)
+            this.dataInfo(res.data)
-                            this.loading = false
+            this.loading = false
-                        })
+          })
-                    }
+        }
 
-                })
+      })
-            },
+    },
-        },
+  },
-    }
+}
 
 </script>

jnpf-java-boot/jnpf-web/src/views/scm/processclassification/form.vue

@@ -2,10 +2,10 @@
 
 
     <template>
-  <el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body
+  <el-dialog :title="!dataForm.id ? '新建工序' :'编辑工序'" :close-on-click-modal="false" append-to-body
-    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
+    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
         label-position="right">
         <template v-if="!loading">
           <!-- 具体表单 -->

jnpf-java-boot/jnpf-web/src/views/scm/productUnitwarehouse/form.vue

@@ -107,7 +107,7 @@ export default {
                 unitName: undefined,
                 remark: undefined,
                 status: "1",
-                unitType: "2",
+                unitType: "1",
                 source: "2",
                 creatorTime: undefined,
                 creatorUserId: undefined,

jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue

@@ -91,7 +91,7 @@
                         <jnpf-form-tip-item label="商品分类" v-if="judgeShow('productCategoryId')" prop="productCategoryId">
                             <JnpfSelect v-model="dataForm.productCategoryId"
                                 @change="changeData('productCategoryId', -1)" placeholder="请选择"
-                                :disabled="judgeWrite('productCategoryId')" clearable :style='{ "width": "100%" }'
+                                :disabled="true" clearable :style='{ "width": "100%" }'
                                 :options="productCategoryIdOptions" :props="productCategoryIdProps">
                             </JnpfSelect>
                         </jnpf-form-tip-item>
@@ -364,7 +364,7 @@
                         <jnpf-form-tip-item label="库存天数下限" v-if="judgeShow('inventoryDayDown')" prop="inventoryDayDown">
                             <JnpfInput v-model="dataForm.inventoryDayDown" @change="changeData('inventoryDayDown', -1)"
                                 placeholder="请输入" :disabled="judgeWrite('inventoryDayDown')" clearable
-                                :style='{ "width": "100%" }' :addonAfter="SKU">
+                                :style='{ "width": "100%" }' addonAfter="天">
                             </JnpfInput>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -374,7 +374,7 @@
                             <JnpfInput v-model="dataForm.inventoryDayUpper"
                                 @change="changeData('inventoryDayUpper', -1)" placeholder="请输入"
                                 :disabled="judgeWrite('inventoryDayUpper')" clearable :style='{ "width": "100%" }'
-                                :addonAfter="SKU">
+                                addonAfter="天">
                             </JnpfInput>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -486,7 +486,7 @@ export default {
                 spec: undefined,
                 inventoryType: undefined,
                 brandId: "",
-                productCategoryId: undefined,
+                productCategoryId: "",
                 area: ["354094489370697", "354094489370698", "354094489403463"],
                 dangerousFlag: "1",
                 importedFlag: "1",
@@ -823,10 +823,13 @@ export default {
             this.initDefaultData()
         }
         this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        this.dataForm.productCategoryId = '2'
+        debugger
     },
     async mounted() {
         await this.fnGetUnitO()
         await this.fnChangeDataUnit()
+        this.dataForm.productCategoryId = '1'
     },
     methods: {
         async fnGetUnitO() {
@@ -1031,7 +1034,7 @@ export default {
             getDataInterfaceRes('521594673936990213', template).then(res => {
                 let data = res.data
                 this.productCategoryIdOptions = data
-                this.changeDataFormData(1, 'productCategoryId', 'productCategoryId', index, '')
+                this.changeDataFormData(1, 'productCategoryId', 'productCategoryId', index, '532570567123927301')
             })
         },
         getdangerousFlagOptions() {

jnpf-java-boot/jnpf-web/src/views/scm/productionprocesses/form.vue

@@ -2,14 +2,14 @@
 
 
     <template>
-  <el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body
+  <el-dialog :title="!dataForm.id ? '新建工序库' :'编辑工序库'" :close-on-click-modal="false" append-to-body
     :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
         label-position="right">
         <template v-if="!loading">
           <!-- 具体表单 -->
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfGroupTitle content="工序类型" contentPosition="left">
               </JnpfGroupTitle>
@@ -22,7 +22,20 @@
                 content="     不同的工序类型可实现不同的业务流程，工序类型一旦保存不可修改，请选择更匹配你需求的一个。">
               </JnpfText>
             </jnpf-form-tip-item>
+          </el-col> -->
+
+          <el-col :span="24">
+            <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>
+            <div>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">
+                不同的工序类型可实现不同的业务流程，工序类型一旦保存不可修改，请选择更匹配你需求的一个
+              </span>
+            </div>
           </el-col>
+
           <el-col :span="24">
             <jnpf-form-tip-item label="工序类型" prop="type">
               <JnpfRadio v-model="dataForm.type" @change="changeData('type',-1)" optionType="button"
@@ -31,10 +44,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="8">
             <jnpf-form-tip-item label="工序编号" prop="productionCode">
@@ -69,7 +82,7 @@
               </JnpfUserSelect>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="24">
             <jnpf-form-tip-item label="状态" prop="status">
               <JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
                 optionType="button" direction="horizontal" size="small" :options="statusOptions"
@@ -85,10 +98,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="其他信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">其他信息</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="12">
             <jnpf-form-tip-item label="其他图纸" prop="drawingInformation">

jnpf-java-boot/jnpf-web/src/views/scm/productionprocesses/index.vue

@@ -2,7 +2,7 @@
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-left">
       <div class="JNPF-common-title">
-        <h2>左侧标题</h2>
+        <h2>工序分类</h2>
         <el-dropdown>
           <el-link icon="icon-ym icon-ym-mpMenu" :underline="false" />
           <el-dropdown-menu slot="dropdown">

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

@@ -1380,7 +1380,6 @@ export default {
       }
     },
     productInfo(val, val2) {
-      debugger
       this.dataForm.businessOrderProductRelationalList.push(val2)
       this.dataForm.businessOrderProductRelationalList.splice(-2, 1)
     },

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

@@ -1161,7 +1161,6 @@ export default {
       })
     },
     initVoucherList(list) {
-      debugger
       for (let i = 0; i < list.length; i++) {
         const e = list[i];
         let item = {

jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue

@@ -81,11 +81,11 @@
                 <h2></h2>
               </div>
               <el-table :data="dataForm.vehicleDriverList" size='mini'>
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type=" index" width="50" label="序号" align="center" />
                 <el-table-column label="司机" v-if="judgeShow('vehicledriver-driverId')"
                   prop="driverId">
                   <template slot="header">
-                    <span class="required-sign"></span>司机
+                    <span class="required-sign">*</span>司机
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.driverId"
@@ -224,6 +224,13 @@ export default {
             trigger: 'change'
           },
         ],
+        driverId: [
+          {
+            required: true,
+            message: '请至少选择一个',
+            trigger: 'change'
+          },
+        ]
       },
       typeOptions: [{ "fullName": "重型半挂牵引车", "id": "1" }, { "fullName": "重型牵引车", "id": "2" }, { "fullName": "其他", "id": "3" }],
       typeProps: { "label": "fullName", "value": "id" },

jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/form.vue

@@ -1,33 +1,39 @@
 <template>
   <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
-        :disabled="setting.readonly">
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
+
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
-          <el-col :span="10" v-if="judgeShow('inspectionCode')">
+          <el-col :span="8" v-if="judgeShow('inspectionCode')">
-            <jnpf-form-tip-item label="质检单编号" v-if="judgeShow('inspectionCode')" prop="inspectionCode">
+            <jnpf-form-tip-item label="质检单编号" v-if="judgeShow('inspectionCode')"
-              <JnpfInput v-model="dataForm.inspectionCode" @change="changeData('inspectionCode', -1)"
+              prop="inspectionCode">
-                placeholder="系统自动生成" :disabled="judgeWrite('inspectionCode')" readonly :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.inspectionCode"
+                @change="changeData('inspectionCode', -1)" placeholder="系统自动生成"
+                :disabled="judgeWrite('inspectionCode')" readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="10" v-if="judgeShow('creatorTime')">
+          <el-col :span="8" v-if="judgeShow('creatorTime')">
             <jnpf-form-tip-item label="制单时间" v-if="judgeShow('creatorTime')" prop="creatorTime">
-              <JnpfOpenData v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)" placeholder="系统自动生成"
+              <JnpfOpenData v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)"
-                :disabled="judgeWrite('creatorTime')" readonly :style='{ "width": "100%" }' type="currTime">
+                placeholder="系统自动生成" :disabled="judgeWrite('creatorTime')" readonly
+                :style='{ "width": "100%" }' type="currTime">
               </JnpfOpenData>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('inspectionType')">
-            <jnpf-form-tip-item label="质检类型" v-if="judgeShow('inspectionType')" prop="inspectionType">
+            <jnpf-form-tip-item label="质检类型" v-if="judgeShow('inspectionType')"
-              <JnpfSelect v-model="dataForm.inspectionType" @change="changeData('inspectionType', -1)" placeholder="请选择"
+              prop="inspectionType">
+              <JnpfSelect v-model="dataForm.inspectionType"
+                @change="changeData('inspectionType', -1)" placeholder="请选择"
                 :disabled="judgeWrite('inspectionType')" clearable :style='{ "width": "100%" }'
                 :options="inspectionTypeOptions" :props="inspectionTypeProps">
               </JnpfSelect>
@@ -35,94 +41,106 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('belongUserId')">
             <jnpf-form-tip-item label="质检人员" v-if="judgeShow('belongUserId')" prop="belongUserId">
-              <JnpfUserSelect v-model="dataForm.belongUserId" @change="changeData('belongUserId', -1)" placeholder="请选择"
+              <JnpfUserSelect v-model="dataForm.belongUserId"
-                selectType="all" :ableIds="ableAll.belongUserIdableIds" :disabled="judgeWrite('belongUserId')" clearable
+                @change="changeData('belongUserId', -1)" placeholder="请选择" selectType="all"
-                :style='{ "width": "100%" }'>
+                :ableIds="ableAll.belongUserIdableIds" :disabled="judgeWrite('belongUserId')"
+                clearable :style='{ "width": "100%" }'>
               </JnpfUserSelect>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="8" v-if="judgeShow('inspectionTime')">
-            <jnpf-form-tip-item label="质检时间" v-if="judgeShow('inspectionTime')" prop="inspectionTime">
+            <jnpf-form-tip-item label="质检时间" v-if="judgeShow('inspectionTime')"
-              <JnpfDatePicker v-model="dataForm.inspectionTime" @change="changeData('inspectionTime', -1)"
+              prop="inspectionTime">
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+              <JnpfDatePicker v-model="dataForm.inspectionTime"
-                :disabled="judgeWrite('inspectionTime')" clearable :style='{ "width": "100%" }' type="datetime"
+                @change="changeData('inspectionTime', -1)"
-                format="yyyy-MM-dd HH:mm">
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                placeholder="请选择" :disabled="judgeWrite('inspectionTime')" clearable
+                :style='{ "width": "100%" }' type="datetime" format="yyyy-MM-dd HH:mm">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)"
-                :disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('remark')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="关联信息" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">关联信息</span>
-            </jnpf-form-tip-item>
+            </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.warehousingInspectionVoucherList" size='mini'>
+              <el-table :data="dataForm.warehousingInspectionVoucherList" size='mini' border="">
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="凭证单据编号" v-if="judgeShow('warehousinginspectionvoucher-voucheId')"
+                <el-table-column label="凭证单据编号"
-                  prop="voucheId">
+                  v-if="judgeShow('warehousinginspectionvoucher-voucheId')" align="center"
+                  fixed="left" prop="voucheId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-voucheId')">*</span>凭证单据编号
                   </template>
                   <template slot-scope="scope">
 
-                    <JnpfPopupSelect v-model="scope.row.voucheId" @change="inspectionVoucher" :rowIndex="scope.$index"
+                    <JnpfPopupSelect v-model="scope.row.voucheId" @change="inspectionVoucher"
-                      :formData="dataForm" :templateJson="interfaceRes.warehousinginspectionvouchervoucheId"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.warehousinginspectionvouchervoucheId"
                       placeholder="请选择"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-voucheId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucher_code' :field="'voucheId' + scope.$index" interfaceId="530709323597241349"
+                      relationField='voucher_code' :field="'voucheId' + scope.$index"
-                      :pageSize="20" :columnOptions="warehousinginspectionvouchervoucheIdcolumnOptions" clearable
+                      interfaceId="530709323597241349" :pageSize="20"
+                      :columnOptions="warehousinginspectionvouchervoucheIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="单据类型" v-if="judgeShow('warehousinginspectionvoucher-documentType')"
+                <el-table-column label="单据类型"
-                  prop="documentType">
+                  v-if="judgeShow('warehousinginspectionvoucher-documentType')" prop="documentType"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-documentType')">*</span>单据类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.documentType"
-                      @change="changeData('warehousinginspectionvoucher-documentType', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionvoucher-documentType', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-documentType')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="凭证类型" v-if="judgeShow('warehousinginspectionvoucher-voucherType')"
+                <el-table-column label="凭证类型"
-                  prop="voucherType">
+                  v-if="judgeShow('warehousinginspectionvoucher-voucherType')" prop="voucherType"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-voucherType')">*</span>凭证类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.voucherType"
-                      @change="changeData('warehousinginspectionvoucher-voucherType', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionvoucher-voucherType', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-voucherType')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单编号" v-if="judgeShow('warehousinginspectionvoucher-poundCode')"
+                <el-table-column label="磅单编号"
-                  prop="poundCode">
+                  v-if="judgeShow('warehousinginspectionvoucher-poundCode')" prop="poundCode"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-poundCode')">*</span>磅单编号
@@ -130,14 +148,16 @@
 
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.poundCode"
-                      @change="changeData('warehousinginspectionvoucher-poundCode', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionvoucher-poundCode', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-poundCode')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="车辆信息" v-if="judgeShow('warehousinginspectionvoucher-vehicleNumber')"
+                <el-table-column label="车辆信息"
+                  v-if="judgeShow('warehousinginspectionvoucher-vehicleNumber')" align="center"
                   prop="vehicleNumber">
                   <template slot="header">
                     <span class="required-sign"
@@ -145,44 +165,50 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.vehicleNumber"
-                      @change="changeData('warehousinginspectionvoucher-vehicleNumber', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionvoucher-vehicleNumber', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-vehicleNumber')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="毛重" v-if="judgeShow('warehousinginspectionvoucher-grossWeight')"
+                <el-table-column label="毛重"
-                  prop="grossWeight">
+                  v-if="judgeShow('warehousinginspectionvoucher-grossWeight')" prop="grossWeight"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('warehousinginspectionvoucher-grossWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionvoucher-grossWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-grossWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="皮重" v-if="judgeShow('warehousinginspectionvoucher-tareWeight')"
+                <el-table-column label="皮重"
-                  prop="tareWeight">
+                  v-if="judgeShow('warehousinginspectionvoucher-tareWeight')" prop="tareWeight"
+                  align="center">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionvoucherList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('warehousinginspectionvoucher-tareWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionvoucher-tareWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-tareWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="扣重" v-if="judgeShow('warehousinginspectionvoucher-buckleWeight')"
+                <el-table-column label="扣重"
+                  v-if="judgeShow('warehousinginspectionvoucher-buckleWeight')" align="center"
                   prop="buckle_weight">
                   <template slot="header">
                     <span class="required-sign"
@@ -190,14 +216,16 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('warehousinginspectionvoucher-buckleWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionvoucher-buckleWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionvoucherList') || judgeWrite('warehousinginspectionvoucherList-buckleWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginspectionvoucherList')">
+                <el-table-column label="操作" width="50" align="center"
+                  v-if="!judgeWrite('warehousinginspectionvoucherList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousinginspectionvoucherList(scope.$index)">删除</el-button>
@@ -217,52 +245,59 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="商品数据" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品数据</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('warehousinginspectionvoucher-voucherCode')">
             <jnpf-form-tip-item label-width="0">
               <div class="JNPF-common-title">
                 <h2></h2>
               </div>
-              <el-table :data="dataForm.warehousingInspectionProductList" size='mini'>
+              <el-table :data="dataForm.warehousingInspectionProductList" size='mini' border="">
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="商品名称" v-if="judgeShow('warehousinginspectionproduct-productId')"
+                <el-table-column label="商品名称"
-                  prop="productId">
+                  v-if="judgeShow('warehousinginspectionproduct-productId')" prop="productId"
+                  align="center" fixed="left">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionproductList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
 
-                    <JnpfPopupSelect v-model="scope.row.productId" @change="inspectionProduct" :rowIndex="scope.$index"
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="inspectionProduct"
-                      :formData="dataForm" :templateJson="interfaceRes.warehousinginspectionproductproductId"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.warehousinginspectionproductproductId"
                       placeholder="请选择"
                       :disabled="judgeWrite('warehousinginspectionproductList') || judgeWrite('warehousinginspectionproductList-productId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      relationField='name' :field="'productId' + scope.$index" interfaceId="530714636022995973"
+                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
-                      :pageSize="20" :columnOptions="warehousinginspectionproductproductIdcolumnOptions" clearable
+                      interfaceId="530714636022995973" :pageSize="20"
+                      :columnOptions="warehousinginspectionproductproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" v-if="judgeShow('warehousinginspectionproduct-spec')" prop="buckle_weight">
+                <el-table-column label="规格" v-if="judgeShow('warehousinginspectionproduct-spec')"
+                  align="center" prop="buckle_weight">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('warehousingInspectionProductList-spec')">*</span>规格
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingInspectionProductList-spec')">*</span>规格
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('warehousinginspectionproduct-spec', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionproduct-spec', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousingInspectionProductList') || judgeWrite('warehousingInspectionProductList-spec')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="库存单位" v-if="judgeShow('warehousinginspectionproduct-inventoryUnitIds')"
+                <el-table-column label="库存单位"
+                  v-if="judgeShow('warehousinginspectionproduct-inventoryUnitIds')" align="center"
                   prop="buckle_weight">
                   <template slot="header">
                     <span class="required-sign"
@@ -278,7 +313,8 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginspectionproductList')">
+                <el-table-column label="操作" width="50" align="center"
+                  v-if="!judgeWrite('warehousinginspectionproductList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousinginspectionproductList(scope.$index)">删除</el-button>
@@ -290,7 +326,8 @@
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div> -->
 
-              <div class="table-actions" @click="choiceProduct(dataForm.warehousingInspectionVoucherList[0].productId)"
+              <div class="table-actions"
+                @click="choiceProduct(dataForm.warehousingInspectionVoucherList[0].productId)"
                 v-if="!judgeWrite('warehousinginspectionproductList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
@@ -298,10 +335,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
+            <div style="padding:15px 0px">
-              <JnpfGroupTitle content="检测结论" contentPosition="left">
+              <span style="color: #409EFF;">▋</span>
-              </JnpfGroupTitle>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">检测结论</span>
-            </jnpf-form-tip-item>
+            </div>
           </el-col>
           <el-col :span="24">
             <jnpf-form-tip-item label-width="0">
@@ -310,63 +347,67 @@
               </div>
               <el-table :data="dataForm.warehousingInspectionConclusionList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="毛重" v-if="judgeShow('warehousinginspectionconclusion-grossWeight')"
+                <el-table-column label="毛重"
+                  v-if="judgeShow('warehousinginspectionconclusion-grossWeight')"
                   prop="grossWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.grossWeight" @change="grossWeightChange" :precision="6" :min="0"
+                    <JnpfInput v-model="scope.row.grossWeight" @change="grossWeightChange"
-                      prop="grossWeight" placeholder="请输入" :disabled="judgeWrite('warehousinginspectionconclusionList') ||
+                      :precision="6" :min="0" prop="grossWeight" placeholder="请输入" :disabled="judgeWrite('warehousinginspectionconclusionList') ||
-    judgeWrite('warehousinginspectionconclusionList-grossWeight')" clearable :style='{ "width": "100%" }'>
+    judgeWrite('warehousinginspectionconclusionList-grossWeight')" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重" v-if="judgeShow('warehousinginspectionconclusion-tareWeight')"
+                <el-table-column label="皮重"
-                  prop="tareWeight">
+                  v-if="judgeShow('warehousinginspectionconclusion-tareWeight')" prop="tareWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.tareWeight" @change="grossWeightChange" :precision="6" :min="0"
+                    <JnpfInput v-model="scope.row.tareWeight" @change="grossWeightChange"
-                      placeholder="请输入"
+                      :precision="6" :min="0" placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-tareWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="扣重" v-if="judgeShow('warehousinginspectionconclusion-buckleWeight')"
+                <el-table-column label="扣重"
+                  v-if="judgeShow('warehousinginspectionconclusion-buckleWeight')"
                   prop="buckleWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-buckleWeight')">*</span>扣重
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.buckleWeight" @change="grossWeightChange" :precision="6" :min="0"
+                    <JnpfInput v-model="scope.row.buckleWeight" @change="grossWeightChange"
-                      placeholder="请输入"
+                      :precision="6" :min="0" placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-buckleWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重(自动计算)" v-if="judgeShow('warehousinginspectionconclusion-netWeight')"
+                <el-table-column label="净重(自动计算)"
-                  prop="netWeight">
+                  v-if="judgeShow('warehousinginspectionconclusion-netWeight')" prop="netWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-netWeight')">*</span>净重(自动计算)
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
-                      @change="changeData('warehousinginspectionconclusion-netWeight', scope.$index)" :precision="6"
+                      @change="changeData('warehousinginspectionconclusion-netWeight', scope.$index)"
-                      :min="0" placeholder="请输入"
+                      :precision="6" :min="0" placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-netWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="是否降级" v-if="judgeShow('warehousinginspectionconclusion-reduceLevel')"
+                <el-table-column label="是否降级"
+                  v-if="judgeShow('warehousinginspectionconclusion-reduceLevel')"
                   prop="reduceLevel">
                   <template slot="header">
                     <span class="required-sign"
@@ -383,20 +424,23 @@
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="等级" v-if="judgeShow('warehousinginspectionconclusion-grade')" prop="grade">
+                <el-table-column label="等级"
+                  v-if="judgeShow('warehousinginspectionconclusion-grade')" prop="grade">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousinginspectionconclusionList-grade')">*</span>等级
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grade"
-                      @change="changeData('warehousinginspectionconclusion-grade', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousinginspectionconclusion-grade', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousinginspectionconclusionList') || judgeWrite('warehousinginspectionconclusionList-grade')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="创建用户" v-if="judgeShow('warehousinginspectionconclusion-creatorUserId')"
+                <el-table-column label="创建用户"
+                  v-if="judgeShow('warehousinginspectionconclusion-creatorUserId')"
                   prop="creatorUserId">
                   <template slot="header">
                     <span class="required-sign"
@@ -411,7 +455,8 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('warehousinginspectionconclusionList')">
+                <el-table-column label="操作" width="50"
+                  v-if="!judgeWrite('warehousinginspectionconclusionList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delwarehousinginspectionconclusionList(scope.$index)">删除</el-button>
@@ -431,30 +476,36 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('conclusionType')">
-            <jnpf-form-tip-item label="检测结论" v-if="judgeShow('conclusionType')" prop="conclusionType">
+            <jnpf-form-tip-item label="检测结论" v-if="judgeShow('conclusionType')"
-              <JnpfSelect v-model="dataForm.conclusionType" @change="changeData('conclusionType', -1)" placeholder="请选择"
+              prop="conclusionType">
+              <JnpfSelect v-model="dataForm.conclusionType"
+                @change="changeData('conclusionType', -1)" placeholder="请选择"
                 :disabled="judgeWrite('conclusionType')" clearable :style='{ "width": "100%" }'
                 :options="conclusionTypeOptions" :props="conclusionTypeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24" v-if="judgeShow('conclusionRemark')">
+          <el-col :span="8" v-if="judgeShow('conclusionRemark')">
-            <jnpf-form-tip-item label="检验结果" v-if="judgeShow('conclusionRemark')" prop="conclusionRemark">
+            <jnpf-form-tip-item label="检验结果" v-if="judgeShow('conclusionRemark')"
-              <JnpfInput v-model="dataForm.conclusionRemark" @change="changeData('conclusionRemark', -1)"
+              prop="conclusionRemark">
-                placeholder="请输入" :disabled="judgeWrite('conclusionRemark')" clearable :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.conclusionRemark"
+                @change="changeData('conclusionRemark', -1)" placeholder="请输入"
+                :disabled="judgeWrite('conclusionRemark')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
 
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
-    <InspectionVoucher v-if="inspectionVoucherVisible" ref="inspectionVoucherBox" @refreshDataList="initList" />
+    <InspectionVoucher v-if="inspectionVoucherVisible" ref="inspectionVoucherBox"
-    <BomProductGoodsBox v-if="BomgoodsBoxVisible" ref="BomGoodsBox" @refreshDataList="initProductList" />
+      @refreshDataList="initList" />
+    <BomProductGoodsBox v-if="BomgoodsBoxVisible" ref="BomGoodsBox"
+      @refreshDataList="initProductList" />
 
   </div>
 </template>

jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue

@@ -10,27 +10,28 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
+              <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
-                endPlaceholder="结束日期" />
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="质检类型">
-              <JnpfSelect v-model="query.inspectionType" placeholder="请选择" clearable :options="inspectionTypeOptions"
+              <JnpfSelect v-model="query.inspectionType" placeholder="请选择" clearable
-                :props="inspectionTypeProps" multiple>
+                :options="inspectionTypeOptions" :props="inspectionTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="质检人员">
-                <JnpfUserSelect selectType="all" v-model="query.belongUserId" placeholder="请选择" clearable multiple />
+                <JnpfUserSelect selectType="all" v-model="query.belongUserId" placeholder="请选择"
+                  clearable multiple />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="质检时间">
-                <JnpfDateRangePicker v-model="query.inspectionTime" format="yyyy-MM-dd HH:mm" startPlaceholder="开始日期"
+                <JnpfDateRangePicker v-model="query.inspectionTime" format="yyyy-MM-dd HH:mm"
-                  endPlaceholder="结束日期">
+                  startPlaceholder="开始日期" endPlaceholder="结束日期">
                 </JnpfDateRangePicker>
               </el-form-item>
             </el-col>
@@ -39,7 +40,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@@ -52,9 +54,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -66,15 +70,19 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          custom-column border @selection-change="handleSelectionChange"
-          <el-table-column prop="inspectionCode" label="质检单编号" align="center" sortable width="200px" fixed="left">
+          :span-method="arraySpanMethod">
+          <el-table-column prop="inspectionCode" label="质检单编号" align="center" sortable width="200px"
+            fixed="left">
           </el-table-column>
-          <el-table-column label="质检类型" prop="inspectionType" align="center" sortable width="100px" fixed="left">
+          <el-table-column label="质检类型" prop="inspectionType" align="center" sortable width="100px"
+            fixed="left">
             <template slot-scope="scope">
               {{ scope.row.inspectionType }}
             </template>
@@ -107,7 +115,7 @@
           </el-table-column>
           <el-table-column prop="belongUserId" label="质检人员" align="center" width="150px">
           </el-table-column>
-          <el-table-column prop="inspectionTime" label="质检时间" align="center" width="105px">
+          <el-table-column prop="inspectionTime" label="质检时间" align="center" width="150px">
           </el-table-column>
           <el-table-column prop="flowState" label="状态" width="100" align="center">
             <template slot-scope="scope" v-if="!scope.row.top">
@@ -133,26 +141,30 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+        <pagination :total="total" :page.sync="listQuery.currentPage"
-          @pagination="initData" />
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{ item.fullName }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 

jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue

@@ -126,17 +126,14 @@
         <!-- <div class="template-item" v-for="item in flowList" :key="item.id"
           @click="selectFlow(item)">{{item.fullName}}
         </div> -->
-
         <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ "入库单" }}
         </div>
       </el-scrollbar>
     </el-dialog>
-
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
     <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
     <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
-
     <purRouter v-if="purVisible" ref="purRouter" @refresh="initData" />
 
   </div>

jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue

@@ -1,11 +1,11 @@
 <template>
   <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
-        :disabled="setting.readonly">
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfGroupTitle content="单据类型" contentPosition="left">
               </JnpfGroupTitle>
@@ -18,44 +18,71 @@
                 content="       不同的单据类型，需要选择不同的收货信息">
               </JnpfText>
             </jnpf-form-tip-item>
+          </el-col> -->
+
+          <el-col :span="24">
+            <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>
+            <div>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">
+                不同的单据类型，需要选择不同的收货信息。
+              </span>
+            </div>
           </el-col>
+
           <el-col :span="24" v-if="judgeShow('type')">
             <jnpf-form-tip-item label="单据类型" v-if="judgeShow('type')" prop="type">
-              <JnpfRadio v-model="dataForm.type" @change="changeData('type', -1)" :disabled="judgeWrite('type')"
+              <JnpfRadio v-model="dataForm.type" @change="changeData('type', -1)"
-                optionType="button" direction="horizontal" size="medium" :options="typeOptions" :props="typeProps">
+                :disabled="judgeWrite('type')" optionType="button" direction="horizontal"
+                size="medium" :options="typeOptions" :props="typeProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfGroupTitle content="基础信息" contentPosition="left">
               </JnpfGroupTitle>
             </jnpf-form-tip-item>
+          </el-col> -->
+          <el-col :span="24">
+            <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('code')">
             <jnpf-form-tip-item label="单据编号" v-if="judgeShow('code')" prop="code">
-              <JnpfInput v-model="dataForm.code" @change="changeData('code', -1)" placeholder="系统自动生成"
+              <JnpfInput v-model="dataForm.code" @change="changeData('code', -1)"
-                :disabled="judgeWrite('code')" readonly :style='{ "width": "100%" }'>
+                placeholder="系统自动生成" :disabled="judgeWrite('code')" readonly
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessfactoryId')">
-            <jnpf-form-tip-item label="工厂名称" v-if="judgeShow('businessfactoryId')" prop="businessfactoryId">
+            <jnpf-form-tip-item label="工厂名称" v-if="judgeShow('businessfactoryId')"
-              <JnpfPopupSelect v-model="dataForm.businessfactoryId" @change="changeData('businessfactoryId', -1)"
+              prop="businessfactoryId">
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessfactoryId" placeholder="请选择"
+              <JnpfPopupSelect v-model="dataForm.businessfactoryId"
-                :disabled="judgeWrite('businessfactoryId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                @change="changeData('businessfactoryId', -1)" :rowIndex="null" :formData="dataForm"
-                popupType="dialog" relationField='name' field='businessfactoryId' interfaceId="521651055751075845"
+                :templateJson="interfaceRes.businessfactoryId" placeholder="请选择"
-                :pageSize="20" :columnOptions="businessfactoryIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :disabled="judgeWrite('businessfactoryId')" hasPage propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+                field='businessfactoryId' interfaceId="521651055751075845" :pageSize="20"
+                :columnOptions="businessfactoryIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessId')">
             <jnpf-form-tip-item label="生产线" v-if="judgeShow('businessId')" prop="businessId">
-              <JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId', -1)" :rowIndex="null"
+              <JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId', -1)"
-                :formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
-                :disabled="judgeWrite('businessId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                placeholder="请选择" :disabled="judgeWrite('businessId')" hasPage propsValue="id"
-                popupType="dialog" relationField='name' field='businessId' interfaceId="517979330417001669"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                :pageSize="20" :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                field='businessId' interfaceId="517979330417001669" :pageSize="20"
+                :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -63,72 +90,85 @@
           <el-col :span="8" v-if="judgeShow('workTime')">
             <jnpf-form-tip-item label="加工时间" v-if="judgeShow('workTime')" prop="workTime">
               <JnpfDatePicker v-model="dataForm.workTime" @change="changeData('workTime', -1)"
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                :disabled="judgeWrite('workTime')" clearable :style='{ "width": "100%" }' type="date"
+                placeholder="请选择" :disabled="judgeWrite('workTime')" clearable
-                format="yyyy-MM-dd">
+                :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessCode')">
             <jnpf-form-tip-item label="外部单据编号" v-if="judgeShow('businessCode')" prop="businessCode">
-              <JnpfInput v-model="dataForm.businessCode" @change="changeData('businessCode', -1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.businessCode" @change="changeData('businessCode', -1)"
-                :disabled="judgeWrite('businessCode')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('businessCode')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('teamId')">
             <jnpf-form-tip-item label="生产班组" v-if="judgeShow('teamId')" prop="teamId">
-              <JnpfPopupSelect v-model="dataForm.teamId" @change="changeData('teamId', -1)" :rowIndex="null"
+              <JnpfPopupSelect v-model="dataForm.teamId" @change="changeData('teamId', -1)"
-                :formData="dataForm" :templateJson="interfaceRes.teamId" placeholder="请选择"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.teamId"
-                :disabled="judgeWrite('teamId')" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                placeholder="请选择" :disabled="judgeWrite('teamId')" hasPage propsValue="id"
-                popupType="dialog" relationField='team_name' field='teamId' interfaceId="523050983727575621"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='team_name'
-                :pageSize="20" :columnOptions="teamIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                field='teamId' interfaceId="523050983727575621" :pageSize="20"
+                :columnOptions="teamIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="24">
             <jnpf-form-tip-item label="状态" prop="status">
-              <JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)" optionType="button"
+              <JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)"
-                direction="horizontal" size="medium" :options="statusOptions" :props="statusProps">
+                optionType="button" direction="horizontal" size="medium" :options="statusOptions"
+                :props="statusProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
 
-          <el-col :span="10" v-if="judgeShow('warehouseId')">
+          <el-col :span="8" v-if="judgeShow('warehouseId')">
             <jnpf-form-tip-item label="仓库名称" v-if="judgeShow('warehouseId')" prop="warehouseId">
-              <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
+              <JnpfPopupSelect v-model="dataForm.warehouseId"
-                :formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择" hasPage propsValue="id"
+                @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
+                :templateJson="interfaceRes.warehouseId" placeholder="请选择" hasPage propsValue="id"
-                interfaceId="529573170819104773" :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                :style='{ "width": "100%" }'>
+                field='warehouseId' interfaceId="529573170819104773" :pageSize="20"
+                :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)"
-                :disabled="judgeWrite('remark')" clearable :style='{ "width": "100%" }'>
+                placeholder="请输入" :disabled="judgeWrite('remark')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfGroupTitle content="加工成品" contentPosition="left">
               </JnpfGroupTitle>
             </jnpf-form-tip-item>
+          </el-col> -->
+          <el-col :span="24">
+            <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.workOrderProductList" size='mini'>
+              <el-table :data="dataForm.workOrderProductList" size='mini' border>
-                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="商品名称" v-if="judgeShow('workorderproduct-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('workorderproduct-productId')"
+                  align="center" fixed="left" prop="productId" width="150px">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderproductList-productId')">*</span>商品名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-productId')">*</span>商品名称
                   </template>
 
                   <template slot-scope="scope">
@@ -136,28 +176,27 @@
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.workorderproductproductId" placeholder="请选择"
                       :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-productId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      relationField='name' :field="'productId' + scope.$index" interfaceId="519505017699307077"
+                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
-                      :pageSize="20" :columnOptions="workorderproductproductIdcolumnOptions" clearable
+                      interfaceId="519505017699307077" :pageSize="20"
+                      :columnOptions="workorderproductproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="存货类型" prop="inventoryType">
+                <el-table-column label="存货类型" prop="inventoryType" width="150px" align="center">
-
                   <template slot="header">
                     <span class="required-sign">*</span>存货类型
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryType" placeholder="请输入" disabled clearable
+                    <JnpfInput v-model="scope.row.inventoryType" placeholder="请输入" disabled
-                      :style='{ "width": "100%" }'>
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-
+                <el-table-column label="规格" prop="spec" width="200px" align="center">
-                <el-table-column label="规格" prop="spec">
 
                   <template slot="header">
                     <span class="required-sign">*</span>规格
@@ -168,21 +207,18 @@
                       :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
-
                 </el-table-column>
-                <el-table-column label="库存单位" prop="inventoryUnitIds">
+                <el-table-column label="库存单位" prop="inventoryUnitIds" width="150px" align="center">
-
                   <template slot="header">
                     <span class="required-sign">*</span>库存单位
                   </template>
-
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryUnitIds" placeholder="请输入" disabled clearable
+                    <JnpfInput v-model="scope.row.inventoryUnitIds" placeholder="请输入" disabled
-                      :style='{ "width": "100%" }'>
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="条码" prop="barCode">
+                <el-table-column label="条码" prop="barCode" width="250px" align="center">
 
                   <template slot="header">
                     <span class="required-sign">*</span>条码
@@ -195,116 +231,122 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')" prop="unitId">
+                <el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')"
-
+                  align="center" prop="unitId" width="150px">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderproductList-unitId')">*</span>加工单位
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-unitId')">*</span>加工单位
                   </template>
 
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.unitId"
-                      @change="changeData('workorderproduct-unitId', scope.$index)" :rowIndex="scope.$index"
+                      @change="changeData('workorderproduct-unitId', scope.$index)"
-                      :formData="dataForm" :templateJson="interfaceRes.workorderproductunitId" placeholder="请选择"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.workorderproductunitId" placeholder="请选择"
                       :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-unitId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      relationField='unit_name' :field="'unitId' + scope.$index" interfaceId="523054191598383685"
+                      popupType="dialog" relationField='unit_name' :field="'unitId' + scope.$index"
-                      :pageSize="20" :columnOptions="workorderproductunitIdcolumnOptions" clearable
+                      interfaceId="523054191598383685" :pageSize="20"
+                      :columnOptions="workorderproductunitIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="加工数量" v-if="judgeShow('workorderproduct-proportionNum')" prop="proportionNum">
+                <el-table-column label="加工数量" v-if="judgeShow('workorderproduct-proportionNum')"
+                  align="center" prop="proportionNum" width="180px">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderproductList-proportionNum')">*</span>加工数量
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-proportionNum')">*</span>加工数量
                   </template>
 
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.proportionNum"
-                      @change="changeData('workorderproduct-proportionNum', scope.$index)" placeholder="请输入"
+                      @change="changeData('workorderproduct-proportionNum', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-proportionNum')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="BOM" v-if="judgeShow('workorderproduct-bomId')" prop="bomId">
+                <el-table-column label="BOM" v-if="judgeShow('workorderproduct-bomId')" prop="bomId"
-
+                  align="center" width="300px">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderproductList-bomId')">*</span>BOM
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-bomId')">*</span>BOM
                   </template>
-
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.bomId"
-                      @change="changeData('workorderproduct-bomId', scope.$index)" :rowIndex="scope.$index"
+                      @change="changeData('workorderproduct-bomId', scope.$index)"
-                      :formData="dataForm" :templateJson="interfaceRes.workorderproductbomId" placeholder="请选择"
+                      :rowIndex="scope.$index" :formData="dataForm"
-                      :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-bomId')" hasPage
+                      :templateJson="interfaceRes.workorderproductbomId" placeholder="请选择"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='bom_name'
+                      :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-bomId')"
-                      :field="'bomId' + scope.$index" interfaceId="523054588681531973" :pageSize="20"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      :columnOptions="workorderproductbomIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                      popupType="dialog" relationField='bom_name' :field="'bomId' + scope.$index"
+                      interfaceId="523054588681531973" :pageSize="20"
+                      :columnOptions="workorderproductbomIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="参考成本价" v-if="judgeShow('workorderproduct-cost')" prop="cost">
+                <el-table-column label="参考成本价" v-if="judgeShow('workorderproduct-cost')" prop="cost"
+                  align="center" width="180px">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderproductList-cost')">*</span>参考成本价
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-cost')">*</span>参考成本价
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.cost" @change="changeData('workorderproduct-cost', scope.$index)"
+                    <JnpfInput v-model="scope.row.cost"
-                      placeholder="请输入"
+                      @change="changeData('workorderproduct-cost', scope.$index)" placeholder="请输入"
                       :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cost')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="货区名称" v-if="judgeShow('workorderproduct-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('workorderproduct-cargoId')"
+                  align="center" prop="cargoId" width="180px">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderproductList-cargoId')">*</span>货区名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-cargoId')">*</span>货区名称
                   </template>
 
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.cargoId"
-                      @change="changeData('workorderproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
+                      @change="changeData('workorderproduct-cargoId', scope.$index)"
-                      :formData="dataForm" :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择"
+                      :rowIndex="scope.$index" :formData="dataForm"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择" hasPage
-                      relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      :pageSize="20" :columnOptions="workorderproductcargoIdcolumnOptions" clearable
+                      relationField='cargo_name' :field="'cargoId' + scope.$index"
+                      interfaceId="530700536261903749" :pageSize="20"
+                      :columnOptions="workorderproductcargoIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
-
-                  <!-- <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.cargoId"
-                      @change="changeData('workorderproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择"
-                      :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
-                      :pageSize="20" :columnOptions="workorderproductcargoIdcolumnOptions" clearable
-                      :style='{ "width": "100%" }'>
-                    </JnpfPopupSelect>
-                  </template> -->
                 </el-table-column>
 
-
+                <el-table-column label="备注" v-if="judgeShow('workorderproduct-remark')"
-                <el-table-column label="备注" v-if="judgeShow('workorderproduct-remark')" prop="remark">
+                  align="center" prop="remark" width="200px">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderproductList-remark')">*</span>备注
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderproductList-remark')">*</span>备注
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.remark" @change="changeData('workorderproduct-remark', scope.$index)"
+                    <JnpfInput v-model="scope.row.remark"
+                      @change="changeData('workorderproduct-remark', scope.$index)"
                       placeholder="请输入"
                       :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-remark')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('workorderproductList')">
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('workorderproductList')"
+                  align="center">
 
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
@@ -315,55 +357,64 @@
               <!-- <div class="table-actions" @click="addworkorderproductList()" v-if="!judgeWrite('workorderproductList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div> -->
-              <div class="table-actions" @click="choice()" v-if="!judgeWrite('workorderproductList')">
+              <div class="table-actions" @click="choice()"
+                v-if="!judgeWrite('workorderproductList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
 
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfGroupTitle content="原材料" contentPosition="left">
               </JnpfGroupTitle>
             </jnpf-form-tip-item>
+          </el-col> -->
+          <el-col :span="24">
+            <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('workorderproduct-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
-              <!-- <div class="JNPF-common-title">
+              <el-table :data="dataForm.workOrderPrimaryList" size='mini' border="">
-                <h2>设计子表</h2>
+                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-              </div> -->
+                <el-table-column label="商品名称" v-if="judgeShow('workorderprimary-productId')"
-              <el-table :data="dataForm.workOrderPrimaryList" size='mini'>
+                  align="center" fixed="left" prop="productId">
-                <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('workorderprimary-productId')" prop="productId">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderprimaryList-productId')">*</span>商品名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderprimaryList-productId')">*</span>商品名称
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.productId" @change="changePrimaryList" :rowIndex="scope.$index"
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="changePrimaryList"
-                      :formData="dataForm" :templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择"
+                      :rowIndex="scope.$index" :formData="dataForm"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      :templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择"
-                      relationField='name' :field="'productId' + scope.$index" interfaceId="519505017699307077"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      :pageSize="20" :columnOptions="workorderprimaryproductIdcolumnOptions" clearable
+                      popupType="dialog" relationField='name' :field="'productId' + scope.$index"
+                      interfaceId="519505017699307077" :pageSize="20"
+                      :columnOptions="workorderprimaryproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="存货类型" prop="inventoryType">
+                <el-table-column label="存货类型" prop="inventoryType" align="center">
 
                   <template slot="header">
                     <span class="required-sign">*</span>存货类型
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryType" placeholder="请输入" disabled clearable
+                    <JnpfInput v-model="scope.row.inventoryType" placeholder="请输入" disabled
-                      :style='{ "width": "100%" }'>
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="规格" prop="spec">
+                <el-table-column label="规格" prop="spec" align="center">
 
                   <template slot="header">
                     <span class="required-sign">*</span>规格
@@ -376,19 +427,19 @@
                   </template>
 
                 </el-table-column>
-                <el-table-column label="库存单位" prop="lastModifyUserId">
+                <el-table-column label="库存单位" prop="lastModifyUserId" align="center">
 
                   <template slot="header">
                     <span class="required-sign">*</span>库存单位
                   </template>
 
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryUnitIds" placeholder="请输入" disabled clearable
+                    <JnpfInput v-model="scope.row.inventoryUnitIds" placeholder="请输入" disabled
-                      :style='{ "width": "100%" }'>
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="条码" prop="deleteUserId">
+                <el-table-column label="条码" prop="deleteUserId" width="300px" align="center">
 
                   <template slot="header">
                     <span class="required-sign">*</span>条码
@@ -400,10 +451,12 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="理论发料量" v-if="judgeShow('workorderprimary-theoryNum')" prop="theoryNum">
+                <el-table-column label="理论发料量" v-if="judgeShow('workorderprimary-theoryNum')"
+                  align="center" prop="theoryNum">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderprimaryList-theoryNum')">*</span>理论发料量
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderprimaryList-theoryNum')">*</span>理论发料量
                   </template>
                   <!-- <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.theoryNum"
@@ -416,60 +469,57 @@
 
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.theoryNum"
-                      @change="changeData('workorderprimary-theoryNum', scope.$index)" placeholder="请输入" clearable
+                      @change="changeData('workorderprimary-theoryNum', scope.$index)"
-                      :style='{ "width": "100%" }'>
+                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="实际发料量" v-if="judgeShow('workorderprimary-realityNum')" prop="realityNum">
+                <el-table-column label="实际发料量" v-if="judgeShow('workorderprimary-realityNum')"
+                  align="center" prop="realityNum">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderprimaryList-realityNum')">*</span>实际发料量
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderprimaryList-realityNum')">*</span>实际发料量
                   </template>
-                  <!-- <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.realityNum"
-                      @change="changeData('workorderprimary-realityNum',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-realityNum')"
-                      clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template> -->
 
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.realityNum"
-                      @change="changeData('workorderprimary-realityNum', scope.$index)" placeholder="请输入" clearable
+                      @change="changeData('workorderprimary-realityNum', scope.$index)"
-                      :style='{ "width": "100%" }'>
+                      placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
 
                 </el-table-column>
 
-                <el-table-column label="货区名称" v-if="judgeShow('workorderprimary-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('workorderprimary-cargoId')"
+                  align="center" prop="cargoId">
 
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('workorderprimaryList-cargoId')">*</span>货区名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('workorderprimaryList-cargoId')">*</span>货区名称
                   </template>
 
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.cargoId"
-                      @change="changeData('workorderprimary-cargoId', scope.$index)" :rowIndex="scope.$index"
+                      @change="changeData('workorderprimary-cargoId', scope.$index)"
-                      :formData="dataForm" :templateJson="interfaceRes.workorderprimarycargoId" placeholder="请选择"
+                      :rowIndex="scope.$index" :formData="dataForm"
-                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      :templateJson="interfaceRes.workorderprimarycargoId" placeholder="请选择" hasPage
-                      relationField='cargo_name' :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      :pageSize="20" :columnOptions="workorderprimarycargoIdcolumnOptions" clearable
+                      relationField='cargo_name' :field="'cargoId' + scope.$index"
+                      interfaceId="530700536261903749" :pageSize="20"
+                      :columnOptions="workorderprimarycargoIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('workorderprimaryList')">
+                <el-table-column label="操作" width="50px" align="center">
-
-
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delworkorderprimaryList(scope.$index)">删除</el-button>
                   </template>
                 </el-table-column>
+
               </el-table>
               <!-- <div class="table-actions" @click="addworkorderprimaryList()">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
@@ -479,20 +529,19 @@
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
 
-
             </jnpf-form-tip-item>
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
 
     <BomProductGoodsBox v-if="BomgoodsBoxVisible" ref="BomGoodsBox" @refreshDataList="initList" />
-    <BomProductRawGoodsBox v-if="BomgoodsBoxRawVisible" ref="BomGoodsRawBox" @refreshDataList="initRawList" />
+    <BomProductRawGoodsBox v-if="BomgoodsBoxRawVisible" ref="BomGoodsRawBox"
-
+      @refreshDataList="initRawList" />
 
   </div>
 </template>

jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue

@@ -15,7 +15,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据类型">
-              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps">
+              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
+                :props="typeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -30,9 +31,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -44,13 +47,16 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          custom-column border @selection-change="handleSelectionChange"
-          <el-table-column prop="businessfactoryId" label="工厂名称" align="center" sortable fixed="left">
+          :span-method="arraySpanMethod">
+          <el-table-column prop="businessfactoryId" label="工厂名称" align="center" sortable
+            fixed="left">
           </el-table-column>
           <el-table-column prop="code" label="单据编号" align="center sortable" fixed="left">
           </el-table-column>
@@ -75,7 +81,6 @@
             </template>
           </el-table-column>
 
-
           <el-table-column prop="flowState" label="状态" width="100" align="center">
 
             <template slot-scope="scope" v-if="!scope.row.top">
@@ -95,8 +100,8 @@
                 v-has="'btn_starts'">加工
               </el-button>
 
-              <el-button v-if="scope.row.status == 3" type="text" @click="addOstartsEnd(scope.row.id)"
+              <el-button v-if="scope.row.status == 3" type="text"
-                v-has="'btn_starts'">完成
+                @click="addOstartsEnd(scope.row.id)" v-has="'btn_starts'">完成
               </el-button>
 
               <el-button v-if="scope.row.status == 3 || scope.row.status == 2" type="text"
@@ -115,26 +120,30 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+        <pagination :total="total" :page.sync="listQuery.currentPage"
-          @pagination="initData" />
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{ item.fullName }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 
@@ -418,7 +427,7 @@ export default {
         dataType: 0,
         menuId: this.menuId,
         moduleId: '523046103495488069',
-        type: 1,
+
       };
       request({
         url: `/api/scm/WorkOrder/getList`,