diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 1b8cdd25..846a0421 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -472,6 +472,18 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "businessLine1/workshopLineIndex",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "businessLine1/produceLineIndex",
+ "style": {
+ "navigationBarTitleText": ""
+ }
}
]
},
diff --git a/jnpf-app/pages/scm/form/businessLine1/produceLineIndex.vue b/jnpf-app/pages/scm/form/businessLine1/produceLineIndex.vue
new file mode 100644
index 00000000..b37cb55f
--- /dev/null
+++ b/jnpf-app/pages/scm/form/businessLine1/produceLineIndex.vue
@@ -0,0 +1,814 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.businesscontact1List.length==0?"添加":"添加"}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jnpf-app/pages/scm/form/businessLine1/workshopLineIndex.vue b/jnpf-app/pages/scm/form/businessLine1/workshopLineIndex.vue
new file mode 100644
index 00000000..ca989ea4
--- /dev/null
+++ b/jnpf-app/pages/scm/form/businessLine1/workshopLineIndex.vue
@@ -0,0 +1,757 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.businessContactList.length==0?"添加":"添加"}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jnpf-app/pages/scm/index/businessLine1/index.vue b/jnpf-app/pages/scm/index/businessLine1/index.vue
new file mode 100644
index 00000000..0b29edd3
--- /dev/null
+++ b/jnpf-app/pages/scm/index/businessLine1/index.vue
@@ -0,0 +1,539 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+ 检索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{column.label}}:
+ {{item[column.prop]}}
+
+
+ {{column.label}}:
+ {{toThousands(item[column.prop],column)}}
+ {{item[column.prop]}}
+
+
+
+
+
+
+
+ 审批状态：
+
+ {{getFlowStatus(item.flowState).text}}
+
+
+
+
+
+
+ {{it.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-app/pages/workFlow/flowBefore/form.vue b/jnpf-app/pages/workFlow/flowBefore/form.vue
index 0417d7c4..25717f4c 100644
--- a/jnpf-app/pages/workFlow/flowBefore/form.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/form.vue
@@ -66,6 +66,16 @@
@eventReceiver="eventReceiver"
v-if="config.formEnCode === 'warehousingInspection'"
/>
+
+
businessContact1List = businessLine1Service.getBusinessContact1List(entity.getId());
- businessLine1Map.put("businessContact1List",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
+// businessLine1Map.put("businessContact1List",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
+ businessLine1Map.put("businessContactList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
+
businessLine1Map = generaterSwapUtil.swapDataForm(businessLine1Map,BusinessLine1Constant.getFormData(),BusinessLine1Constant.TABLEFIELDKEY,BusinessLine1Constant.TABLERENAMES);
return ActionResult.success(businessLine1Map);
}
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java
index 845877ae..bcd1c882 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java
@@ -215,7 +215,7 @@ public class BusinessLineController {
else if (businessLineForm.getDiffFlag().equals("5")){
//新增业务线 的生产线
businessLineForm.setDiffFlag("6");
- businessLineForm.setParentId(businessLineForm.getWorkshopId());
+ businessLineForm.setWorkshopId(businessLineForm.getWorkshopId());
}
businessLineService.saveOrUpdate(businessLineForm, id ,true);
}catch(Exception e){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java
index db0843b8..b1044d74 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java
@@ -104,7 +104,7 @@ public class BusinessLineForm {
@TableField("WORKSHOP_AREA")
private String workshopArea;
- /** 车间面积 **/
+ /** 车间父id **/
@TableField("WORKSHOP_ID")
private String workshopId;
}