From 57f7bb071c41578781b5919cfe21862850ee34f0 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Thu, 11 Jul 2024 08:34:19 +0800
Subject: [PATCH] fix energy

---
 src/views/erp/product/product/index.vue       |  37 ++----
 src/views/mes/energydevice/ResetForm.vue      | 116 ++++++++++++++++++
 .../EnergyDeviceCheckRecordList.vue           |   2 +
 src/views/mes/energydevice/index.vue          |  19 ++-
 src/views/mes/energydevicecheck/index.vue     |  45 +++----
 src/views/mes/task/components/PlanPlan.vue    |   2 +-
 6 files changed, 163 insertions(+), 58 deletions(-)
 create mode 100644 src/views/mes/energydevice/ResetForm.vue

diff --git a/src/views/erp/product/product/index.vue b/src/views/erp/product/product/index.vue
index 28f88b5d..ad0e8842 100644
--- a/src/views/erp/product/product/index.vue
+++ b/src/views/erp/product/product/index.vue
@@ -20,17 +20,6 @@
           class="!w-240px"
         />
       </el-form-item>
-<!--      <el-form-item label="分类" prop="categoryId">-->
-<!--        <el-tree-select-->
-<!--          v-model="queryParams.categoryId"-->
-<!--          :data="categoryList"-->
-<!--          :props="defaultProps"-->
-<!--          check-strictly-->
-<!--          default-expand-all-->
-<!--          placeholder="请输入分类"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -68,23 +57,23 @@
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="条码" align="center" prop="barCode" />
-      <el-table-column label="名称" align="center" prop="name"  width="140px"/>
+      <el-table-column label="名称" align="left" prop="name"  width="220px"/>
       <el-table-column label="规格" align="center" prop="standard" />
       <el-table-column label="分类" align="center" prop="categoryName" />
       <el-table-column label="单位" align="center" prop="unitName" />
 
-      <el-table-column
-        label="销售价格"
-        align="center"
-        prop="salePrice"
-        :formatter="erpPriceTableColumnFormatter"
-      />
-      <el-table-column
-        label="最低价格"
-        align="center"
-        prop="minPrice"
-        :formatter="erpPriceTableColumnFormatter"
-      />
+<!--      <el-table-column-->
+<!--        label="销售价格"-->
+<!--        align="center"-->
+<!--        prop="salePrice"-->
+<!--        :formatter="erpPriceTableColumnFormatter"-->
+<!--      />-->
+<!--      <el-table-column-->
+<!--        label="最低价格"-->
+<!--        align="center"-->
+<!--        prop="minPrice"-->
+<!--        :formatter="erpPriceTableColumnFormatter"-->
+<!--      />-->
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
diff --git a/src/views/mes/energydevice/ResetForm.vue b/src/views/mes/energydevice/ResetForm.vue
new file mode 100644
index 00000000..d2074391
--- /dev/null
+++ b/src/views/mes/energydevice/ResetForm.vue
@@ -0,0 +1,116 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="名称" prop="name">
+        <el-input  disabled v-model="formData.name" placeholder="请输入名称" />
+      </el-form-item>
+      <el-form-item label="编码" prop="code">
+        <el-input disabled v-model="formData.code" placeholder="请输入编码" />
+      </el-form-item>
+
+      <el-form-item label="最后抄表值" prop="lastCheckValue">
+        <el-input v-model="formData.lastCheckValue" placeholder="请输入最后抄表值" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { EnergyDeviceApi, EnergyDeviceVO } from '@/api/mes/energydevice'
+
+/** 能源设备 表单 */
+defineOptions({ name: 'EnergyDeviceForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  code: undefined,
+  deviceType: undefined,
+  info: undefined,
+  checkCron: undefined,
+  lastCheckTime: undefined,
+  lastCheckValue: undefined,
+  unitName: undefined,
+  isEnable: undefined
+})
+const formRules = reactive({
+  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = "重置最后抄表值"
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await EnergyDeviceApi.getEnergyDevice(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as EnergyDeviceVO
+    if (formType.value === 'create') {
+      await EnergyDeviceApi.createEnergyDevice(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await EnergyDeviceApi.updateEnergyDevice(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    code: undefined,
+    deviceType: undefined,
+    info: undefined,
+    checkCron: undefined,
+    lastCheckTime: undefined,
+    lastCheckValue: undefined,
+    unitName: undefined,
+    isEnable: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue
index 2b98f272..0484f0d7 100644
--- a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue
+++ b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue
@@ -16,6 +16,7 @@
         prop="lastCheckTime"
         :formatter="dateFormatter"
         width="150px"
+        sortable
       />
       <el-table-column label="上次抄表值" align="center" prop="lastCheckValue" />
       <el-table-column
@@ -24,6 +25,7 @@
         prop="checkTime"
         :formatter="dateFormatter"
         width="150px"
+        sortable
       />
       <el-table-column label="抄表值" align="center" prop="checkValue" />
       <el-table-column label="差值" align="center" prop="diffValue" />
diff --git a/src/views/mes/energydevice/index.vue b/src/views/mes/energydevice/index.vue
index 740e228a..7d22c9be 100644
--- a/src/views/mes/energydevice/index.vue
+++ b/src/views/mes/energydevice/index.vue
@@ -98,7 +98,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" fixed="right" align="center" width="130px">
+      <el-table-column label="操作" fixed="right" align="center" width="150px">
         <template #default="scope">
           <el-button
             link
@@ -108,6 +108,14 @@
           >
             编辑
           </el-button>
+          <el-button
+            link
+            type="warning"
+            @click="resetForm('update', scope.row.id)"
+            v-hasPermi="['mes:energy-device:update']"
+          >
+            重置
+          </el-button>
           <el-button
             link
             type="danger"
@@ -130,6 +138,8 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <EnergyDeviceForm ref="formRef" @success="getList" />
+  <!-- 表单弹窗：添加/修改 -->
+  <ResetForm ref="formRef" @success="getList" />
   <!-- 子表的列表 -->
   <ContentWrap>
     <el-tabs model-value="energyDeviceCheckRecord">
@@ -146,6 +156,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { EnergyDeviceApi, EnergyDeviceVO } from '@/api/mes/energydevice'
 import EnergyDeviceForm from './EnergyDeviceForm.vue'
+import ResetForm from './ResetForm.vue'
 import EnergyDeviceCheckRecordList from './components/EnergyDeviceCheckRecordList.vue'
 
 /** 能源设备 列表 */
@@ -203,7 +214,11 @@ const formRef = ref()
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
-
+/** 添加/修改操作 */
+const resetFormRef = ref()
+const resetForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/src/views/mes/energydevicecheck/index.vue b/src/views/mes/energydevicecheck/index.vue
index e0beae53..a340d8fc 100644
--- a/src/views/mes/energydevicecheck/index.vue
+++ b/src/views/mes/energydevicecheck/index.vue
@@ -65,24 +65,26 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 
-      <el-table-column label="能源设备" align="center" prop="deviceId" />
+      <el-table-column label="能源设备" align="center" prop="deviceId" sortable/>
+      <el-table-column label="抄表值" align="center" prop="checkValue" />
+      <el-table-column label="差值" align="center" prop="diffValue" />
+      <el-table-column label="上次抄表值" align="center" prop="lastCheckValue" />
       <el-table-column
-        label="上次抄表时间"
+        label="抄表时间"
         align="center"
-        prop="lastCheckTime"
+        prop="checkTime"
         :formatter="dateFormatter"
-        width="180px"
+        width="170px"
+        sortable
       />
-      <el-table-column label="上次抄表值" align="center" prop="lastCheckValue" />
-      <el-table-column label="抄表值" align="center" prop="checkValue" />
       <el-table-column
-        label="抄表时间"
+        label="上次抄表时间"
         align="center"
-        prop="checkTime"
+        prop="lastCheckTime"
         :formatter="dateFormatter"
-        width="180px"
+        width="170px"
+        sortable
       />
-      <el-table-column label="差值" align="center" prop="diffValue" />
       <el-table-column label="单价" align="center" prop="unitPrice" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
@@ -90,28 +92,9 @@
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
-        width="180px"
+        width="170px"
       />
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['mes:energy-device-check-record:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['mes:energy-device-check-record:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
+
     </el-table>
     <!-- 分页 -->
     <Pagination
diff --git a/src/views/mes/task/components/PlanPlan.vue b/src/views/mes/task/components/PlanPlan.vue
index 03868c35..5adebbb3 100644
--- a/src/views/mes/task/components/PlanPlan.vue
+++ b/src/views/mes/task/components/PlanPlan.vue
@@ -19,7 +19,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="未完成数" prop="planNumber">
-            <el-input disabled v-model="formData.planNumber" placeholder="请输入"/>
+            <el-input v-model="formData.planNumber" placeholder="请输入"/>
           </el-form-item>
         </el-col>
       </el-row>