diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 8143a031..1b8cdd25 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -460,6 +460,18 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "bom/index",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "warehousingInspection/index",
+ "style": {
+ "navigationBarTitleText": ""
+ }
}
]
},
diff --git a/jnpf-app/pages/scm/form/bom/index.vue b/jnpf-app/pages/scm/form/bom/index.vue
new file mode 100644
index 00000000..60734c5d
--- /dev/null
+++ b/jnpf-app/pages/scm/form/bom/index.vue
@@ -0,0 +1,787 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.bomItemList.length==0?"添加":"添加"}}
+
+
+
+
+
+
+
+
+
+
+
+ ({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.bomItemValueList.length==0?"添加":"添加"}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jnpf-app/pages/scm/form/warehousingInspection/index.vue b/jnpf-app/pages/scm/form/warehousingInspection/index.vue
new file mode 100644
index 00000000..b42f15bf
--- /dev/null
+++ b/jnpf-app/pages/scm/form/warehousingInspection/index.vue
@@ -0,0 +1,1080 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.warehousingInspectionVoucherList.length==0?"添加":"添加"}}
+
+
+
+
+
+
+
+
+
+
+
+ ({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.warehousingInspectionProductList.length==0?"添加":"添加"}}
+
+
+
+
+
+
+
+
+
+
+
+ ({{i+1}})
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dataForm.warehousingInspectionConclusionList.length==0?"添加":"添加"}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jnpf-app/pages/scm/index/bom/index.vue b/jnpf-app/pages/scm/index/bom/index.vue
new file mode 100644
index 00000000..e1c718d3
--- /dev/null
+++ b/jnpf-app/pages/scm/index/bom/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/scm/index/warehousingInspection/index.vue b/jnpf-app/pages/scm/index/warehousingInspection/index.vue
new file mode 100644
index 00000000..79c24bd3
--- /dev/null
+++ b/jnpf-app/pages/scm/index/warehousingInspection/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 017572d1..0417d7c4 100644
--- a/jnpf-app/pages/workFlow/flowBefore/form.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/form.vue
@@ -56,6 +56,16 @@
@eventReceiver="eventReceiver"
v-if="config.formEnCode === 'energyConsumption'"
/>
+
+