diff --git a/.env.dev b/.env.dev
index 03228f8a..75b4a12d 100644
--- a/.env.dev
+++ b/.env.dev
@@ -18,7 +18,7 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48082'
+# VUE_APP_BASE_API = 'http://192.168.4.173:9001'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
diff --git a/src/views/energy/base/energyQuantityManual/components/AddTable.vue b/src/views/energy/base/energyQuantityManual/components/AddTable.vue
new file mode 100644
index 00000000..741453cc
--- /dev/null
+++ b/src/views/energy/base/energyQuantityManual/components/AddTable.vue
@@ -0,0 +1,139 @@
+<template>
+	<div class="energyQuantityManualAddTable">
+		<el-table
+			:data="renderData"
+			border
+			style="width: 100%"
+			:header-cell-style="{
+				background: '#F2F4F9',
+				color: '#606266',
+			}">
+			<el-table-column
+				prop="tableName"
+				label="表名*">
+				<template slot-scope="scope">
+					<div class="tableInner">
+						<el-select
+							v-model="scope.row.tableName"
+							placeholder="请选择"
+							style="width: 100%"
+							@change="changeSelect(scope.row, 'tableName')">
+							<el-option
+								v-for="item in tableNameList"
+								:key="item.id"
+								:label="item.label"
+								:value="item.id"></el-option>
+						</el-select>
+					</div>
+				</template>
+			</el-table-column>
+			<el-table-column
+				prop="readingQuantity"
+				label="抄表数*">
+				<template slot-scope="scope">
+					<div class="tableInner">
+						<el-input-number
+							v-model="scope.row.readingQuantity"
+							:min="0"
+							:max="999999999"
+							style="width: 100%"
+							:controls="false"
+							@change="changeInput(scope.row, 'readingQuantity')"
+							:precision="2"></el-input-number>
+					</div>
+				</template>
+			</el-table-column>
+		</el-table>
+		<el-button
+			class="addButton"
+			icon="el-icon-plus"
+			@click="emitButtonClick">
+			新增
+		</el-button>
+	</div>
+</template>
+<script>
+export default {
+	name: 'AddTable',
+	props: {
+		tableData: {
+			type: Array,
+			required: true,
+			default: () => {
+				return [];
+			},
+		},
+		tableNameList: {
+			type: Array,
+			required: true,
+			default: () => {
+				return [];
+			},
+		},
+	},
+	data() {
+		return {};
+	},
+	computed: {
+		renderData() {
+			return this.tableData.map((item, index) => {
+				return {
+					...item,
+					_pageIndex: index + 1,
+				};
+			});
+		},
+	},
+	methods: {
+		emitButtonClick() {
+			this.$emit('emitButtonClick');
+		},
+		changeInput(val1, val2) {
+			val1.prop = val2;
+			this.$emit('emitFun', val1);
+		},
+		changeSelect(val1, val2) {
+			val1.prop = val2;
+			this.$emit('emitFun', val1);
+		},
+	},
+};
+</script>
+<style lang='scss' scoped>
+.energyQuantityManualAddTable {
+	.el-table .el-table__cell {
+		padding: 0;
+		height: 35px;
+	}
+	.addButton {
+		width: 100%;
+		height: 35px;
+		border-top: none;
+		color: #0b58ff;
+		border-color: #ebeef5;
+		border-radius: 0;
+	}
+	.addButton:hover {
+		color: #0b58ff;
+		border-color: #ebeef5;
+		background-color: #fff;
+	}
+	.addButton:focus {
+		border-color: #ebeef5;
+		background-color: #fff;
+	}
+	.tableInner .el-input__inner {
+		border: none;
+		padding: 0;
+		height: 33px;
+	}
+}
+</style>
+<style lang='scss'>
+.energyQuantityManualAddTable {
+	.el-table .el-table__cell {
+		padding: 0;
+		height: 35px;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
index 7956cb8b..4cfefa61 100644
--- a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
+++ b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
@@ -1,167 +1,228 @@
 <template>
-  <el-form ref="energyQuantityManualForm" :rules="rules" label-width="90px" :model="form">
-    <el-row :gutter="20">
-      <el-col :span='12'>
-        <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
-            <el-option v-for="item in this.energyTypeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span='12'>
-        <el-form-item label="抄表日期" prop="recordTime">
-          <el-date-picker v-model="form.recordTime" type="date" format="yyyy-MM-dd" value-format="timestamp"
-            placeholder="选择日期" style="width: 100%;">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='24'>
-        <base-table border :table-props="tableProps" :table-data="tableData" :add-button-show="addButtonShow"
-          @emitFun="inputChange" @emitButtonClick="emitButtonClick" />
-      </el-col>
-    </el-row>
-  </el-form>
+	<el-form
+		ref="energyQuantityManualForm"
+		:rules="rules"
+		label-width="90px"
+		:model="form">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="能源类型"
+					prop="energyTypeId">
+					<el-select
+						v-model="form.energyTypeId"
+						placeholder="请选择"
+						style="width: 100%"
+						@change="selEnergyType"
+						filterable>
+						<el-option
+							v-for="item in this.energyTypeList"
+							:key="item.id"
+							:label="item.labelName"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="抄表日期"
+					prop="recordTime">
+					<el-date-picker
+						v-model="form.recordTime"
+						type="date"
+						format="yyyy-MM-dd"
+						value-format="timestamp"
+						placeholder="选择日期"
+						style="width: 100%"></el-date-picker>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<add-table
+					:table-props="tableProps"
+					:table-data="tableData"
+					:table-name-list="tableNameList"
+					@emitFun="inputChange"
+					@emitButtonClick="emitButtonClick" />
+				<!-- <base-table
+					border
+					:table-props="tableProps"
+					:table-data="tableData"
+					:add-button-show="addButtonShow"
+					@emitFun="inputChange"
+					@emitButtonClick="emitButtonClick" /> -->
+			</el-col>
+		</el-row>
+	</el-form>
 </template>
 <script>
-import { energyQuantityManualCreate, energyQuantityManualUpdate, energyQuantityManualGet } from '@/api/base/energyQuantityManual'
-import moment from 'moment'
-import InputArea from './InputArea'
-import SelectArea from './SelectArea'
+import {
+	energyQuantityManualCreate,
+	energyQuantityManualUpdate,
+	energyQuantityManualGet,
+} from '@/api/base/energyQuantityManual';
+import moment from 'moment';
+import AddTable from './AddTable';
+import InputArea from './InputArea';
+import SelectArea from './SelectArea';
+import { energyTableGet } from '@/api/base/energyQuantityManual';
 const tableProps = [
-  {
-    prop: 'tableName',
-    label: '表名*',
-    subcomponent: SelectArea
-  },
-  {
-    prop: 'readingQuantity',
-    label: '抄表数*',
-    subcomponent: InputArea
-  }
-]
+	{
+		prop: 'tableName',
+		label: '表名*',
+		subcomponent: SelectArea,
+	},
+	{
+		prop: 'readingQuantity',
+		label: '抄表数*',
+		subcomponent: InputArea,
+	},
+];
 export default {
-  name: 'EnergyQuantityManualAdd',
-  props: {
-    energyTypeList: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      tableProps,
-      tableData: [],
-      addButtonShow: '新增',
-      form: {
-        id: '',
-        energyTypeId: '',
-        unit: '',
-        recordTime: ''
-      },
-      rules: {
-        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
-        recordTime: [{ required: true, message: '抄表日期不能为空', trigger: 'change' }]
-      },
-      isEdit: false
-    }
-  },
-  methods: {
-    init(params) {
-      this.form.recordTime = moment().valueOf()
-      if (params.type === 'add') {
-        this.isEdit = false
-      } else if (params.type === 'meterReading') {
-        this.isEdit = false
-        this.form.energyTypeId = params.energyTypeId
-        let obj = {}
-        obj.tableName = params.tableName + ''
-        obj.readingQuantity = 0
-        this.tableData.push(obj)
-      } else {
-        this.isEdit = true
-        this.form.id = params.id
-        this.addButtonShow = ''
-        energyQuantityManualGet({ id: this.form.id }).then(res => {
-          if (res.code === 0) {
-            this.form.energyTypeId = res.data.energyTypeId
-            this.form.recordTime = res.data.recordTime ? res.data.recordTime : null
-            let obj = {}
-            obj.tableName = res.data.tableName ? res.data.tableName + '' : ''
-            obj.readingQuantity = res.data.readingQuantity
-            this.tableData.push(obj)
-          }
-        })
-      }
-    },
-    inputChange(val) {
-      this.tableData[val._pageIndex - 1][val.prop] = val[val.prop]
-    },
-    emitButtonClick() {
-      let obj = {}
-      obj.tableName = ''
-      obj.readingQuantity = 0
-      this.tableData.push(obj)
-    },
-    submitForm() {
-      this.$refs['energyQuantityManualForm'].validate((valid) => {
-        if (valid) {
-          // 校验表格
-          if (this.tableData.length === 0) {
-            this.$modal.msgError("抄表数据不能为空");
-            return false
-          } else {
-            for (let item of this.tableData) {
-              console.log(item)
-              if (!item.tableName || (!item.readingQuantity && item.readingQuantity !== 0)) {
-                this.$modal.msgError("抄表数据有空值，请检查");
-                return false
-              }
-            }
-          }
-          if (this.isEdit) {
-            // 编辑
-            energyQuantityManualUpdate({
-              id: this.form.id,
-              energyTypeId: this.form.energyTypeId,
-              recordTime: this.form.recordTime,
-              tableName: this.tableData[0].tableName,
-              readingQuantity: this.tableData[0].readingQuantity
-            }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            energyQuantityManualCreate({
-              energyTypeId: this.form.energyTypeId,
-              recordTime: this.form.recordTime,
-              data: this.tableData
-            }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.energyQuantityManualForm.resetFields()
-      this.form.unit = ''
-      this.isEdit = false
-      this.addButtonShow = '新增'
-      this.tableData = []
-    }
-  }
-}
+	name: 'EnergyQuantityManualAdd',
+	props: {
+		energyTypeList: {
+			type: Array,
+			required: true,
+			default: () => {
+				return [];
+			},
+		},
+	},
+	data() {
+		return {
+			tableProps,
+			tableData: [],
+			tableNameList: [], //表名list
+			addButtonShow: '新增',
+			form: {
+				id: '',
+				energyTypeId: '',
+				unit: '',
+				recordTime: '',
+			},
+			rules: {
+				energyTypeId: [
+					{ required: true, message: '能源类型不能为空', trigger: 'change' },
+				],
+				recordTime: [
+					{ required: true, message: '抄表日期不能为空', trigger: 'change' },
+				],
+			},
+			isEdit: false,
+		};
+	},
+	components: { AddTable },
+	methods: {
+		init(params) {
+			this.form.recordTime = moment().valueOf();
+			if (params.type === 'add') {
+				this.isEdit = false;
+			} else if (params.type === 'meterReading') {
+				this.isEdit = false;
+				this.form.energyTypeId = params.energyTypeId;
+				let obj = {};
+				obj.tableName = params.tableName + '';
+				obj.readingQuantity = 0;
+				this.tableData.push(obj);
+			} else {
+				this.isEdit = true;
+				this.form.id = params.id;
+				this.addButtonShow = '';
+				energyQuantityManualGet({ id: this.form.id }).then((res) => {
+					if (res.code === 0) {
+						this.form.energyTypeId = res.data.energyTypeId;
+						this.form.recordTime = res.data.recordTime
+							? res.data.recordTime
+							: null;
+						let obj = {};
+						obj.tableName = res.data.tableName ? res.data.tableName + '' : '';
+						obj.readingQuantity = res.data.readingQuantity;
+						this.tableData.push(obj);
+					}
+				});
+			}
+		},
+		inputChange(val) {
+			this.tableData[val._pageIndex - 1][val.prop] = val[val.prop];
+			console.log(this.tableData);
+		},
+		emitButtonClick() {
+			if (!this.form.energyTypeId) {
+				this.$modal.msgWarning('请先选择能源类型');
+				return false;
+			}
+			let obj = {};
+			obj.tableName = '';
+			obj.readingQuantity = 0;
+			this.tableData.push(obj);
+		},
+		selEnergyType(id) {
+			// 切换能源类型
+			this.tableData = [];
+			this.tableNameList = [];
+			energyTableGet({ energyTypeId: id }).then((res) => {
+				this.tableNameList = res.data.tableObjs || [];
+			});
+		},
+		submitForm() {
+			this.$refs['energyQuantityManualForm'].validate((valid) => {
+				if (valid) {
+					// 校验表格
+					if (this.tableData.length === 0) {
+						this.$modal.msgError('抄表数据不能为空');
+						return false;
+					} else {
+						for (let item of this.tableData) {
+							console.log(item);
+							if (
+								!item.tableName ||
+								(!item.readingQuantity && item.readingQuantity !== 0)
+							) {
+								this.$modal.msgError('抄表数据有空值，请检查');
+								return false;
+							}
+						}
+					}
+					if (this.isEdit) {
+						// 编辑
+						energyQuantityManualUpdate({
+							id: this.form.id,
+							energyTypeId: this.form.energyTypeId,
+							recordTime: this.form.recordTime,
+							tableName: this.tableData[0].tableName,
+							readingQuantity: this.tableData[0].readingQuantity,
+						}).then((res) => {
+							if (res.code === 0) {
+								this.$modal.msgSuccess('操作成功');
+								this.$emit('successSubmit');
+							}
+						});
+					} else {
+						energyQuantityManualCreate({
+							energyTypeId: this.form.energyTypeId,
+							recordTime: this.form.recordTime,
+							data: this.tableData,
+						}).then((res) => {
+							if (res.code === 0) {
+								this.$modal.msgSuccess('操作成功');
+								this.$emit('successSubmit');
+							}
+						});
+					}
+				} else {
+					return false;
+				}
+			});
+		},
+		formClear() {
+			this.$refs.energyQuantityManualForm.resetFields();
+			this.form.unit = '';
+			this.isEdit = false;
+			this.addButtonShow = '新增';
+			this.tableData = [];
+		},
+	},
+};
 </script>
\ No newline at end of file
diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue
index 82e82e34..08303e0f 100644
--- a/src/views/energy/base/energyQuantityManual/index.vue
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -49,9 +49,7 @@ import {
 } from '@/api/base/energyQuantityManual';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
-import { parseTime, parseTimeTable } from '@/utils/ruoyi';
-// import FileSaver from "file-saver"
-// import * as XLSX from 'xlsx/xlsx.mjs'
+import { parseTimeTable } from '@/utils/ruoyi';
 import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
 import moment from 'moment';
 const tableProps = [
diff --git a/src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue b/src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue
index 3b4c3286..5a1715a4 100644
--- a/src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue
+++ b/src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue
@@ -47,7 +47,11 @@ export default {
 			energyTableGet({ energyTypeId: id }).then((res) => {
 				this.form.energyType = res.data.energyType || '';
 				this.form.energyTypeId = res.data.energyTypeId || '';
-				this.form.tableIds = res.data.tableIds || [];
+				this.form.tableIds =
+					res.data.tableObjs &&
+					res.data.tableObjs.map((item) => {
+						return item.id;
+					});
 			});
 		},
 		submitForm() {