diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index bb0770c6..86861683 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -453,6 +453,12 @@
 					"style": {
 						"navigationBarTitleText": ""
 					}
+				},
+				{
+					"path": "energyConsumption/index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
 				}
 			]
 		},
diff --git a/jnpf-app/pages/scm/form/energyConsumption/index.vue b/jnpf-app/pages/scm/form/energyConsumption/index.vue
new file mode 100644
index 00000000..46872f25
--- /dev/null
+++ b/jnpf-app/pages/scm/form/energyConsumption/index.vue
@@ -0,0 +1,483 @@
+<template>
+	<view class="jnpf-wrap jnpf-wrap-form" v-if="!loading">
+		<u-form :model="dataForm" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
+			label-align="right" :label-width="labelwidth" class="jnpf-form">
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('code')" :required="requiredList.code" label="编号" prop="code">
+					<u-input v-model="dataForm.code" disabled @change="changeData('code',-1)" input-align='right'
+						placeholder="系统自动生成" :style='{"width":"100%"}' readonly>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('name')" :required="requiredList.name" label="名称" prop="name">
+					<u-input v-model="dataForm.name" :disabled="judgeWrite('name')" @change="changeData('name',-1)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('monthTime')" :required="requiredList.monthTime" label="隶属月份"
+					prop="monthTime">
+					<jnpf-date-time v-model="dataForm.monthTime" :disabled="judgeWrite('monthTime')"
+						@change="changeData('monthTime',-1)" :startTime="dateTime(false,1,1,'','')"
+						:endTime="dateTime(false,1,1,'','')" format="yyyy-MM" clearable placeholder="请选择" type="date"
+						:style='{"width":"100%"}'>
+					</jnpf-date-time>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('type')" :required="requiredList.type" label="单据类型" prop="type">
+					<jnpf-radio v-model="dataForm.type" :disabled="judgeWrite('type')" @change="changeData('type',-1)"
+						optionType="button" direction="horizontal" :props="typeProps" :options="typeOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('cost')" :required="requiredList.cost" label="费用信息" prop="cost">
+					<u-input v-model="dataForm.cost" :disabled="judgeWrite('cost')" @change="changeData('cost',-1)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('remark')" :required="requiredList.remark" label="备注" prop="remark">
+					<u-input v-model="dataForm.remark" :disabled="judgeWrite('remark')"
+						@change="changeData('remark',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+		</u-form>
+		<u-modal v-model="show" :content="content" width='70%' border-radius="16"
+			:content-style="{fontSize: '28rpx',padding: '20rpx',lineHeight: '44rpx',textAlign: 'left'}"
+			:titleStyle="{padding: '20rpx'}" :confirm-style="{height: '80rpx',lineHeight: '80rpx'}" :title="title"
+			confirm-text="确定">
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		getDictionaryDataSelector,
+		getDataInterfaceRes,
+		getDefaultCurrentValueUserId,
+		getDefaultCurrentValueDepartmentId
+	} from '@/api/common'
+	import comMixin from '../../../workFlow/workFlowForm/mixin'
+	import {
+		getDateDay,
+		getLaterData,
+		getBeforeData,
+		getBeforeTime,
+		getLaterTime
+	} from '@/components/index.js'
+	import request from '@/utils/request'
+	export default {
+		mixins: [comMixin],
+		data() {
+			return {
+				idList: [],
+				index: 0,
+				actionList: [],
+				actionListLength: false,
+				showAction: false,
+				btnLoading: false,
+				loading: false,
+				text: '提示：测试文本',
+				tableKey: '',
+				dataForm: {
+					id: "",
+					code: '',
+					name: '',
+					monthTime: '',
+					type: '',
+					cost: '',
+					remark: '',
+					creatorTime: "",
+					creatorUserId: "",
+					lastModifyTime: "",
+					lastModifyUserId: "",
+				},
+				rules: {
+					name: [{
+						required: true,
+						message: '名称请输入',
+					}, ],
+					monthTime: [{
+						required: true,
+						message: '隶属月份请选择',
+					}, ],
+					type: [{
+						required: true,
+						message: '单据类型不能为空',
+					}, ],
+					cost: [{
+						required: true,
+						message: '费用信息请输入',
+					}, ],
+				},
+				typeOptions: [{
+					"fullName": "电费",
+					"id": "1"
+				}, {
+					"fullName": "水费",
+					"id": "2"
+				}, {
+					"fullName": "煤气费",
+					"id": "3"
+				}],
+				typeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				labelwidth: 100 * 1.5,
+				menuId: '',
+				jurisdictionType: '',
+				ruleList: {},
+				interfaceRes: {
+					code: [],
+					name: [],
+					monthTime: [],
+					type: [],
+					cost: [],
+					remark: [],
+					creatorTime: [],
+					creatorUserId: [],
+					lastModifyTime: [],
+					lastModifyUserId: [],
+				},
+				regList: {},
+				ableAll: {},
+				childIndex: -1,
+				dataValue: {},
+				isEdit: false,
+				userInfo: {},
+				formatType: {
+					"yyyy": "yyyy",
+					"yyyy-MM": "yyyy-mm",
+					"yyyy-MM-dd": "yyyy-mm-dd",
+					"yyyy-MM-dd HH:mm": "yyyy-mm-dd hh:MM",
+					"yyyy-MM-dd HH:mm:ss": "yyyy-mm-dd hh:MM:ss",
+					"HH:mm:ss": "hh:MM:ss",
+					"HH:mm": "hh:MM"
+				},
+				content: '',
+				title: '',
+				show: false,
+			}
+		},
+		onLoad(option) {
+			uni.$on('linkPageConfirm', (subVal) => {
+				if (this.tableKey) {
+					for (let i = 0; i < subVal.length; i++) {
+						let t = subVal[i]
+						if (this['get' + this.tableKey]) {
+							this['get' + this.tableKey](t)
+						}
+					}
+					this.childIndex = -1
+					this.collapse()
+				}
+			})
+			this.jurisdictionType = option.jurisdictionType
+			this.menuId = option.menuId
+			this.userInfo = uni.getStorageSync('userInfo') || {}
+			this.dataForm.id = option.id || 0
+			let _title = ""
+			if (option.jurisdictionType == 'btn_edit') {
+				_title = "编辑"
+			}
+			if (option.jurisdictionType == 'btn_detail') {
+				_title = "详情"
+			}
+			if (option.jurisdictionType == 'btn_add') {
+				_title = "新增"
+			}
+			if (_title) {
+				uni.setNavigationBarTitle({
+					title: _title
+				})
+			}
+			this.selfInit()
+			this.initDefaultData()
+			this.dataAll()
+			this.initData()
+			this.dataValue = JSON.parse(JSON.stringify(this.dataForm))
+			this.idList = option.idList ? option.idList.split(",") : []
+			for (let i = 0; i < this.idList.length; i++) {
+				if (this.idList[i] == option.id) {
+					this.index = i;
+				}
+			}
+			if (!option.id) {
+				this.actionList.push({
+					text: '确定并新增',
+					id: 'save_add'
+				})
+			} else {
+				let upper = {
+					text: '上一条',
+					id: 'upper',
+					disabled: this.index == 0 ? true : false
+				}
+				this.actionList.push(upper)
+				let lower = {
+					text: '下一条',
+					id: 'lower',
+					disabled: this.index == this.idList.length - 1 ? true : false
+				}
+				this.actionList.push(lower)
+				this.actionList.push({
+					text: '确定并继续',
+					id: 'save_proceed'
+				})
+				this.collapse()
+			}
+		},
+		onReady() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$refs.dataForm.setRules(this.rules);
+				}, 100)
+			})
+		},
+		watch: {
+			dataForm: {
+				handler(val, oldVal) {},
+				deep: true
+			}
+		},
+		methods: {
+			handleAction(index) {
+				if (this.actionList[index].id === 'save_add' || this.actionList[index].id === 'save_proceed') {
+					this.submitForm(1)
+				} else {
+					this.calculation(this.actionList[index].id, index)
+				}
+			},
+			calculation(type, index) {
+				if (type === 'upper') {
+					this.index--
+					this.actionList[index + 1].disabled = false
+					if (this.index == 0) this.actionList[index].disabled = true
+				} else {
+					this.index++
+					this.actionList[index - 1].disabled = false
+					if (this.index == this.idList.length - 1) this.actionList[index].disabled = true
+				}
+				this.dataForm.id = this.idList[this.index]
+				this.initData()
+			},
+			changeData(model, index) {
+				this.isEdit = false
+				this.childIndex = index
+				let modelAll = model.split("-");
+				let faceMode = "";
+				for (let i = 0; i < modelAll.length; i++) {
+					faceMode += modelAll[i];
+				}
+				for (let key in this.interfaceRes) {
+					if (key != faceMode) {
+						let faceReList = this.interfaceRes[key]
+						for (let i = 0; i < faceReList.length; i++) {
+							if (faceReList[i].relationField == model) {
+								let options = 'get' + key + 'Options';
+								if (this[options]) {
+									this[options]()
+								}
+								this.changeData(key, index)
+							}
+						}
+					}
+				}
+			},
+			changeDataFormData(type, data, model, index, defaultValue, edit) {
+				if (!edit) {
+					if (type == 2) {
+						for (let i = 0; i < this.dataForm[data].length; i++) {
+							if (index == -1) {
+								this.dataForm[data][i][model] = defaultValue
+							} else if (index == i) {
+								this.dataForm[data][i][model] = defaultValue
+							}
+						}
+					} else {
+						this.dataForm[data] = defaultValue
+					}
+				}
+			},
+			clickIcon(label, tipLabel) {
+				this.content = tipLabel
+				this.title = label
+				this.show = true
+			},
+			exist() {
+				let title = [];
+				let _ruleList = this.ruleList
+				for (let k in _ruleList) {
+					let childData = this.dataForm[k]
+					childData.forEach((item, index) => {
+						for (let model in _ruleList[k]) {
+							if (item[model] instanceof Array) {
+								if (item[model].length == 0) {
+									title.push(_ruleList[k][model])
+								}
+							} else if (!item[model]) {
+								title.push(_ruleList[k][model])
+							}
+						}
+					})
+				}
+				let _regList = this.regList
+				for (let k in _regList) {
+					let childData = this.dataForm[k]
+					for (let n in _regList[k]) {
+						for (let i = 0; i < _regList[k][n].length; i++) {
+							const element = _regList[k][n][i]
+							if (element.pattern) {
+								element.pattern = element.pattern.toString()
+								let start = element.pattern.indexOf('/')
+								let stop = element.pattern.lastIndexOf('/')
+								let str = element.pattern.substring(start + 1, stop)
+								let reg = new RegExp(str)
+								element.pattern = reg
+							}
+							childData.forEach((item, index) => {
+								if (item[n] && !element.pattern.test(item[n])) {
+									title.push(element.message)
+								}
+							})
+						}
+					}
+				}
+				if (title.length > 0) {
+					return title[0]
+				}
+			},
+			resetForm() {
+				uni.navigateBack()
+			},
+			dataAll() {
+				this.collapse()
+			},
+			dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+				let timeDataValue = null;
+				let timeValue = Number(timeValueData)
+				if (timeRule) {
+					if (timeType == 1) {
+						timeDataValue = timeValueData ? timeValue : null
+					} else if (timeType == 2) {
+						timeDataValue = dataValue
+					} else if (timeType == 3) {
+						timeDataValue = new Date().getTime()
+					} else if (timeType == 4) {
+						let previousDate = '';
+						if (timeTarget == 1 || timeTarget == 2) {
+							previousDate = getDateDay(timeTarget, timeType, timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else if (timeTarget == 3) {
+							previousDate = getBeforeData(timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else {
+							timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+						}
+					} else if (timeType == 5) {
+						let previousDate = '';
+						if (timeTarget == 1 || timeTarget == 2) {
+							previousDate = getDateDay(timeTarget, timeType, timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else if (timeTarget == 3) {
+							previousDate = getLaterData(timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else {
+							timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+						}
+					}
+				}
+				return timeDataValue;
+			},
+			time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+				let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+				let timeDataValue = null
+				if (timeRule) {
+					if (timeType == 1 && timeValue) {
+						timeDataValue = timeValue || '00:00:00'
+						if (timeDataValue.split(':').length == 3) {
+							timeDataValue = timeDataValue
+						} else {
+							timeDataValue = timeDataValue + ':00'
+						}
+					} else if (timeType == 2) {
+						timeDataValue = dataValue
+					} else if (timeType == 3) {
+						timeDataValue = this.jnpf.toDate(new Date(), format)
+					} else if (timeType == 4) {
+						let previousDate = '';
+						previousDate = getBeforeTime(timeTarget, timeValue)
+						timeDataValue = this.jnpf.toDate(previousDate, format)
+					} else if (timeType == 5) {
+						let previousDate = '';
+						previousDate = getLaterTime(timeTarget, timeValue)
+						timeDataValue = this.jnpf.toDate(previousDate, format)
+					}
+				}
+				return timeDataValue;
+			},
+			initData() {
+				this.$nextTick(function() {
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/scm/EnergyConsumption/' + this.dataForm.id,
+							method: 'get',
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						})
+					} else {
+						this.initDefaultData()
+					}
+				})
+			},
+			beforeSubmit() {
+				const _data = this.dataList()
+				return _data
+			},
+			initDefaultData() {},
+			selfInit() {
+				this.$store.commit('base/UPDATE_RELATION_DATA', {})
+				this.dataAll()
+				this.initDefaultData()
+				this.collapse()
+			},
+			selfGetInfo(dataForm) {
+				this.dataForm.id = this.dataForm.id
+				this.dataInfo(dataForm)
+			},
+			dataList() {
+				var _data = this.dataForm;
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				this.dataForm = _dataAll
+				this.isEdit = true
+				this.dataAll()
+				this.childIndex = -1
+				this.collapse()
+			},
+			collapse() {
+				setTimeout(() => {}, 1000);
+			},
+		},
+	}
+</script>
+<style>
+	page {
+		background-color: #f0f2f6;
+	}
+</style>
\ No newline at end of file
diff --git a/jnpf-app/pages/scm/index/energyConsumption/index.vue b/jnpf-app/pages/scm/index/energyConsumption/index.vue
new file mode 100644
index 00000000..d3b58667
--- /dev/null
+++ b/jnpf-app/pages/scm/index/energyConsumption/index.vue
@@ -0,0 +1,539 @@
+<template>
+    <view class="dynamicModel-list-v">
+        <view class="head-warp com-dropdown">
+            <u-dropdown class="u-dropdown" ref="uDropdown" @open="openData" >
+                <u-dropdown-item title="排序">
+                    <view class="dropdown-slot-content">
+                        <view class="dropdown-slot-content-main">
+                            <u-cell-group>
+                                <u-cell-item @click="cellClick(item)" :arrow="false" :title="item.label"
+                                             v-for="(item, index) in sortOptions" :key="index" :title-style="{color: sortValue == item.value ? '#2979ff' : '#606266' }">
+                                    <u-icon v-if="sortValue == item.value" name="checkbox-mark" color="#2979ff" size="32"></u-icon>
+                                </u-cell-item>
+                            </u-cell-group>
+                        </view>
+                    </view>
+                </u-dropdown-item>
+                <u-dropdown-item title="筛选" >
+                    <view class="dropdown-slot-content">
+                        <view class="dropdown-slot-content-main search-main">
+                            <scroll-view scroll-y="true" style="height: 1000rpx;">
+                                <view class="u-p-l-20 u-p-r-20 search-form">
+                                    <u-form :model="searchForm" ref="searchForm" :errorType="['toast']" label-position="left" label-width="150">
+                                    </u-form>
+                                </view>
+                            </scroll-view>
+                            <view class="buttom-actions">
+                                <u-button class="buttom-btn" @click="reset">重置</u-button>
+                                <u-button class="buttom-btn" type="primary" @click="closeDropdown">检索</u-button>
+                            </view>
+                            <view class="dropdown-slot-bg" @click="$refs.uDropdown.close()"></view>
+                        </view>
+                    </view>
+                </u-dropdown-item>
+            </u-dropdown>
+        </view>
+        <view class="list-warp">
+            <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption" top="100">
+                <view class="list">
+                    <view class="list-box">
+                        <uni-swipe-action ref="swipeAction">
+                            <uni-swipe-action-item v-for="(item, index) in list" :key="item.id" :threshold="0" :right-options="options">
+                                <view class="item" @click="goDetail(item.id,item)">
+                                    <view class="u-line-1 item-cell" v-for="(column,i) in columnList" :key="i">
+                                        <view v-if="column.jnpfKey != 'table'">
+                                            <view class="" v-if="column.jnpfKey == 'relationForm'">
+                                                <text class="listTit u-line-1">{{column.label}}:</text>
+                                                <text class="listContent"
+                                                      @click.stop="relationFormClick(item,column)"
+                                                      style="color: blue;">{{item[column.prop]}}</text>
+                                            </view>
+                                            <view v-else class="u-line-1">
+                                                <text class="listTit u-line-1">{{column.label}}:</text>
+                                                <text class="listContent" v-if="['calculate','inputNumber'].includes(column.jnpfKey) && column.thousands">{{toThousands(item[column.prop],column)}}</text>
+                                                <text class="listContent" v-else>{{item[column.prop]}}</text>
+                                            </view>
+                                        </view>
+                                        <view class="collapse-box u-flex" v-else>
+                                            <tableCell :label="column.label" :childList="item[column.prop]" @cRelationForm="relationFormClick"
+                                                       :children="column.children" ref="tableCell" :pageLen="3"></tableCell>
+                                        </view>
+                                    </view>
+                                    <view class="item-cell">
+                                        <text>审批状态：</text>
+                                        <text :class="getFlowStatus(item.flowState).statusCss">
+                                            {{getFlowStatus(item.flowState).text}}
+                                        </text>
+                                    </view>
+                                </view>
+                                <template v-slot:right>
+                                    <view class="right-option-box">
+                                        <view class="right-option" v-for="(it,i) in options" @click="handleClick(index)"
+                                              :key="i">
+                                            <text>{{it.text}}</text>
+                                        </view>
+                                    </view>
+                                </template>
+                            </uni-swipe-action-item>
+                        </uni-swipe-action>
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+                <view class="com-addBtn" @click="addPage()" >
+                    <u-icon name="plus" size="60" color="#fff" />
+                </view>
+        <u-picker mode="selector" v-model="show" :default-selector="[0]" title="请选择流程" :range="templateList" range-key="fullName" @confirm="confirm"></u-picker>
+    </view>
+</template>
+<script>
+    import {
+        FlowJsonList
+    } from '@/api/workFlow/flowEngine'
+    import resources from '@/libs/resources.js'
+    import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+    import tableCell from '../dynamicModel/components/tableCell.vue'
+    import {getFormById} from '@/api/workFlow/workFlowForm'
+    import {
+        getDictionaryDataSelector,
+        getDataInterfaceRes,
+        getDefaultCurrentValueUserIdAsync,
+        getDefaultCurrentValueDepartmentIdAsync
+    } from '@/api/common'
+    import request from '@/utils/request'
+    export default {
+        mixins: [MescrollMixin],
+        components: {
+            tableCell
+        },
+        data() {
+            return {
+                show: false,
+                templateList: [],
+                sortValue: '',
+                searchForm: {
+            },
+            downOption: {
+                use: true,
+                        auto: false
+            },
+            dataOptions:{
+            },
+            upOption: {
+                page: {
+                    num: 0,
+                            size: 20,
+                    time: null,
+                },
+                empty: {
+                    use: true,
+                            icon: resources.message.nodata,
+                            tip: "暂无数据",
+                            fixed: true,
+                            top: "300rpx",
+                            zIndex: 5,
+                },
+                textNoMore: '没有更多数据',
+                        toTop: {
+                    bottom: 250
+                }
+            },
+            list: [],
+                    appColumnList:[{"jnpfKey":"billRule","fullName":"编号","label":"编号","sortable":false,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","noShow":false,"tipLabel":"","dragDisabled":false,"rule":"energyConsumption","className":[],"label":"编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_energy_consumption","renderKey":1706842654693,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"生产耗能","tag":"JnpfInput","span":8},"readonly":true,"prop":"code","width":0,"__vModel__":"code","style":{"width":"100%"},"fixed":"none","placeholder":"系统自动生成","id":"code"},{"clearable":true,"jnpfKey":"input","suffixIcon":"","fullName":"名称","label":"名称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"名称","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_energy_consumption","renderKey":1706842700587,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"name","showWordLimit":false,"width":0,"__vModel__":"name","showPassword":false,"style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请输入","id":"name","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM","fullName":"隶属月份","label":"隶属月份","sortable":false,"align":"left","type":"month","__config__":{"endRelationField":"","dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_energy_consumption","renderKey":1706842711118,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"隶属月份","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"prop":"monthTime","width":0,"__vModel__":"monthTime","style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请选择","id":"monthTime","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"border":false,"jnpfKey":"radio","fullName":"单据类型","label":"单据类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"button","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"单据类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_energy_consumption","renderKey":1706842737014,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"medium","prop":"type","width":0,"options":[{"fullName":"电费","id":"1"},{"fullName":"水费","id":"2"},{"fullName":"煤气费","id":"3"}],"__vModel__":"type","style":{},"disabled":false,"interfaceHasPage":false,"fixed":"none","id":"type","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"},{"clearable":true,"jnpfKey":"input","suffixIcon":"","fullName":"费用信息","label":"费用信息","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"费用信息","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_energy_consumption","renderKey":1706842774060,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"cost","showWordLimit":false,"width":0,"__vModel__":"cost","showPassword":false,"style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请输入","id":"cost","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}],
+            listQuery: {
+                moduleId:'523056602735981125',
+                        sort: 'desc',
+                        sidx: '',
+                        keyword: '',
+                        json: ''
+            },
+            options: [
+                        {
+                            text: '删除',
+                            style: {
+                                backgroundColor: '#dd524d'
+                            }
+                        }
+            ],
+                    sortOptions:[
+            ],
+                    ableAll:{
+            },
+            interfaceRes:{
+            },
+            menuId:'',
+                    enCode: 'energyConsumption',
+                    formId: '523056602735981125',
+                    columnList:[],
+                    isTree:false,
+            type:'1',
+                    key:new Date(),
+                    dataValue:{},
+            userInfo:{},
+            firstInitSearchData:false,
+                    thousandsField:[],
+            formatType:{"yyyy":"yyyy","yyyy-MM":"yyyy-mm","yyyy-MM-dd":"yyyy-mm-dd","yyyy-MM-dd HH:mm":"yyyy-mm-dd hh:MM","yyyy-MM-dd HH:mm:ss":"yyyy-mm-dd hh:MM:ss","HH:mm:ss":"hh:MM:ss","HH:mm":"hh:MM"},
+        }
+        },
+        onLoad(e){
+            this.userInfo = uni.getStorageSync('userInfo') || {}
+            this.menuId = e.menuId
+            uni.$on('refresh', () => {
+                this.list = [];
+                this.mescroll.resetUpScroll();
+            })
+            this.dataAll()
+            this.getColumnList()
+            this.getFormById()
+        },
+        onUnload() {
+            uni.$off('refresh')
+        },
+        methods:{
+            toThousands(val, column) {
+                let num = Number(val)
+                let newVal = this.thousandsField.includes(column.__vModel__) ? num.toLocaleString('zh', {maximumFractionDigits: '2',minimumFractionDigits: '2'}): num.toFixed(2);
+                return newVal
+            },
+            getJsonList() {
+                FlowJsonList(this.flowId,'1').then(res => {
+                    this.templateList = res.data;
+                })
+            },
+            getFormById() {
+                getFormById(this.formId).then(res => {
+                    this.flowId = res.data&&res.data.id
+                    this.enCode = res.data&&res.data.enCode
+                    this.getJsonList()
+                })
+            },
+            dataAll(){
+            },
+            openData(e){
+                if(e==1){
+                    //this.reset()
+                }
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+                this.dataValue = JSON.parse(JSON.stringify(this.searchForm))
+            },
+            relationFormClick(item,column) {
+                let vModel = column.__vModel__?column.__vModel__+"_id":column.__vModel__
+                let id = item[vModel]
+                if(vModel){
+                    let [attr,attr1]=vModel.split("_jnpf_")
+                    if(attr&&attr1){
+                        attr = attr.replace('jnpf_','')
+                        id = item[attr]&&item[attr][attr1]
+                    }
+                }
+                let modelId = column.modelId
+                if (!id || !modelId) return
+                let config = {
+                    modelId: modelId,
+                    id: id,
+                    formTitle: '详情',
+                    noShowBtn: 1
+                }
+                this.$nextTick(() => {
+                    const url ='/pages/apply/dynamicModel/detail?config=' + this.base64.encode(JSON.stringify(config),"UTF-8")
+                    uni.navigateTo({
+                        url: url
+                    })
+                })
+            },
+            async upCallback(page) {
+                if(!this.firstInitSearchData) {
+                    await this.initSearchData()
+                    this.firstInitSearchData = true
+                }
+                const query = {
+                    currentPage: page.num,
+                    pageSize: page.size,
+                    menuId : this.menuId,
+                    ...this.listQuery,
+                    ...this.searchForm,
+                    dataType:0,
+                }
+                request({
+                    url: '/api/scm/EnergyConsumption/getList',
+                    method: 'post',
+                    data: query,
+                }).then(res => {
+                    let _list = this.columnList.length?res.data.list:[];
+                    this.mescroll.endSuccess(_list.length);
+                    if (page.num == 1) this.list = [];
+                    const list = _list.map(o => ({
+                        show: false,
+                        ...o
+                    }));
+                    this.list = this.list.concat(_list);
+                }).catch(() => {
+                    this.mescroll.endErr();
+                })
+            },
+            handleClick(index, index1) {
+                    const item = this.list[index]
+                if([1,2,3,5].includes(item.flowState)){
+                    this.$u.toast("流程正在审核,请勿删除")
+                            this.list[index].show = false
+                    return
+                }
+                request({
+                    url: '/api/scm/EnergyConsumption/' + item.id,
+                    method: 'delete'
+                }).then(res => {
+                    uni.showToast({
+                        title: res.msg,
+                        complete: () => {
+                            this.$u.toast(res.msg)
+                            this.mescroll.resetUpScroll()
+                        }
+                    })
+                })
+            },
+            open(index) {
+                this.list[index].show = true;
+                this.list.map((val, idx) => {
+                    if (index != idx) this.list[idx].show = false;
+                })
+            },
+            search() {
+                if (this.isPreview == '1') return
+                this.searchTimer && clearTimeout(this.searchTimer)
+                this.searchTimer = setTimeout(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                }, 300)
+            },
+    goDetail(id, item) {
+        let flowtaskid = item.flowtaskid
+        let flowState =item.flowState
+        let flowId =item.flowId
+        let btnType = ''
+        let btnList = []
+                btnList.push('btn_edit')
+                btnList.push('btn_detail')
+        if(btnList.includes('btn_detail')){
+            btnType = "btn_detail"
+        }
+        if(btnList.includes('btn_edit')){
+            btnType = "btn_edit"
+        }
+        if(!btnType) return
+        let ids = flowtaskid?flowtaskid:id
+        this.flowId = flowId?flowId:this.templateList[0].id
+        this.jumPage(ids, flowState,btnType)
+    },
+    addPage() {
+        if (!this.templateList.length) return this.$u.toast('流程不存在')
+        if (this.templateList.length > 1) {
+            this.show = true
+        } else {
+            this.flowId = this.templateList[0].id
+            this.jumPage()
+        }
+    },
+    confirm(e) {
+        this.flowId = this.templateList[e[0]].id
+        this.jumPage()
+    },
+    jumPage(id, status,btnType){
+        if (!id && !status) btnType = 'btn_add'
+        let _title=""
+        if(btnType=='btn_add'){
+            _title = "新增"
+        }
+        if(btnType=='btn_detail'){
+            _title = "详情"
+        }
+        if(btnType=='btn_edit'){
+            _title = "编辑"
+        }
+        let opType = '-1'
+        if ([1,2,5].includes(status)) opType = 0
+        const config = {
+            id: id || '',
+            enCode: this.enCode,
+            flowId: this.flowId,
+            formType: 1,
+            type: 1,
+            opType,
+            status: status || '',
+            fullName: _title,
+            jurisdictionType: btnType || ''
+        }
+        uni.navigateTo({
+            url: '/pages/workFlow/flowBefore/index?config=' + this.base64.encode(JSON.stringify(config), "UTF-8")
+        })
+    },
+    getFlowStatus(val) {
+        let status
+        switch (val) {
+            case 0:
+                status = {
+                    text: '等待提交',
+                    statusCss: 'u-type-info'
+                }
+                break;
+            case 1:
+                status = {
+                    text: '等待审核',
+                    statusCss: 'u-type-primary'
+                }
+                break;
+            case 2:
+                status = {
+                    text: '审核通过',
+                    statusCss: 'u-type-success'
+                }
+                break;
+            case 3:
+                status = {
+                    text: '审核驳回',
+                    statusCss: 'u-type-error'
+                }
+                break;
+            case 4:
+                status = {
+                    text: '审核撤回',
+                    statusCss: 'u-type-error'
+                }
+                break;
+            case 5:
+                status = {
+                    text: '审核终止',
+                    statusCss: 'u-type-info'
+                }
+                break;
+            default:
+                status = {
+                    text: '等待提交',
+                    statusCss: 'u-type-info'
+                }
+                break;
+        }
+        return status
+    },
+            getColumnList() {
+                let columnPermissionList = []
+                let _appColumnList =this.appColumnList
+                    for (let i = 0; i < _appColumnList.length; i++) {
+                        columnPermissionList.push(_appColumnList[i])
+                    }
+                this.columnList = this.transformColumnList(columnPermissionList, this.dataOptions)
+            },
+            transformColumnList(columnList, dataOptions) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    let e = columnList[i]
+                    let columProp = e.prop
+                    let label = e.label
+                    let option = null
+                    let options = columProp + "Options"
+                    if (!columProp.includes('-')) {
+                        columProp = columProp
+                        if(this.type=='4'){
+                            columProp = columProp +"_name"
+                        }
+                        if(label.length>4){
+                            label = label.substring(0, 4)
+                        }
+                        e.label = label
+                        e.prop = columProp
+                        e.option = option
+                        list.push(e)
+                    } else {
+                        e.vModel = columProp.split('-')[1]
+                        e.childLabel = e.label.split('-')[1]
+                        options = e.vModel + "Options"
+                        let prop = columProp.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                e.prop = e.prop
+                                e.vModel = e.vModel
+                                if(this.type=='4'){
+                                    e.prop = e.prop+"_name"
+                                    e.vModel = e.vModel+"_name"
+                                }
+                                e.option = option
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                return list
+            },
+            cellClick(item) {
+                if (this.sortValue === item.value) return
+                this.listQuery.sort = item.sort
+                this.listQuery.sidx = item.sidx
+                this.sortValue = item.value
+                this.$refs.uDropdown.close();
+                this.$nextTick(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                })
+            },
+            reset() {
+                this.searchForm = JSON.parse(JSON.stringify(this.dataValue))
+                this.key = new Date()
+            },
+            closeDropdown() {
+                this.$refs.uDropdown.close();
+                this.$nextTick(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                })
+            },
+            dataList(data){
+                let _list =data.list
+                return _list;
+            },
+        },
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #f0f2f6;
+        height: 100%;
+        /* #ifdef MP-ALIPAY */
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        /* #endif */
+    }
+
+    .right-option-box {
+        display: flex;
+        width: max-content;
+
+        .right-option {
+            width: 144rpx;
+            height: 100%;
+            font-size: 16px;
+            color: #fff;
+            background-color: #dd524d;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .more-option {
+            background-color: #1890ff;
+        }
+    }
+</style>
diff --git a/jnpf-app/pages/workFlow/flowBefore/form.vue b/jnpf-app/pages/workFlow/flowBefore/form.vue
index 84d30f6b..017572d1 100644
--- a/jnpf-app/pages/workFlow/flowBefore/form.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/form.vue
@@ -51,6 +51,11 @@
 	    @eventReceiver="eventReceiver"
 	    v-if="config.formEnCode === 'saleOrder'"
 	  />
+	  <energyConsumption
+	    ref="form"
+	    @eventReceiver="eventReceiver"
+	    v-if="config.formEnCode === 'energyConsumption'"
+	  />
     </template>
     <template v-if="config.formType == 2">
       <dynamicForm
@@ -74,6 +79,8 @@ import contract from "@/pages/scm/form/contractL/index.vue";
 import productWarehouse from "@/pages/scm/form/productWarehouse/index.vue";
 import purchaseOrder from "@/pages/scm/form/businessOrder/purchaseIndex.vue";
 import saleOrder from "@/pages/scm/form/businessOrder/saleIndex.vue";
+import energyConsumption from "@/pages/scm/form/energyConsumption/index.vue";
+
 export default {
   components: {
     crmOrder,
@@ -85,7 +92,8 @@ export default {
     contract,
 	productWarehouse,
 	purchaseOrder,
-	saleOrder
+	saleOrder,
+	energyConsumption
   },
   props: {
     config: {