diff --git a/src/api/mes/organization/index.ts b/src/api/mes/organization/index.ts
index 3114ef1e..9036e87a 100644
--- a/src/api/mes/organization/index.ts
+++ b/src/api/mes/organization/index.ts
@@ -22,6 +22,9 @@ export const OrganizationApi = {
getOrganizationList: async (params) => {
return await request.get({ url: `/mes/organization/list`, params })
},
+ getListOrgWorker: async (params) => {
+ return await request.get({ url: `/mes/organization/listOrgWorker`, params })
+ },
// 查询产线工位详情
getOrganization: async (id: number) => {
diff --git a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue
index 70d3a96e..bf4b233a 100644
--- a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue
+++ b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue
@@ -9,42 +9,40 @@
>
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
@@ -52,11 +50,14 @@
-
-
+
+
+
+
+
确 定
diff --git a/src/views/mes/energydevicecheck/index.vue b/src/views/mes/energydevicecheck/index.vue
index 236c65c6..e3301d7c 100644
--- a/src/views/mes/energydevicecheck/index.vue
+++ b/src/views/mes/energydevicecheck/index.vue
@@ -66,7 +66,9 @@
导出
+ 本页总差值：{{erpNumberFormatter(totalDiffValue,3)}}
+
@@ -130,6 +132,7 @@ import download from '@/utils/download'
import { EnergyDeviceCheckRecordApi, EnergyDeviceCheckRecordVO } from '@/api/mes/energydevicecheck'
import EnergyDeviceCheckRecordForm from './EnergyDeviceCheckRecordForm.vue'
import {EnergyDeviceVO, EnergyDeviceApi} from "@/api/mes/energydevice";
+import {erpNumberFormatter} from "../../../utils";
/** 抄表记录 列表 */
defineOptions({ name: 'EnergyDeviceCheckRecord' })
@@ -140,7 +143,7 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref([]) // 列表的数据
const deviceList = ref([]) // 列表
-
+const totalDiffValue = ref(0) // 列表的总页数
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
@@ -161,6 +164,13 @@ const getList = async () => {
const data = await EnergyDeviceCheckRecordApi.getEnergyDeviceCheckRecordPage(queryParams)
list.value = data.list
total.value = data.total
+ // 初始化总和为 0
+ let sum = 0;
+ // 遍历列表，累加每个实体对象的 value 属性值
+ for (let entity of list.value) {
+ sum += entity.diffValue;
+ }
+ totalDiffValue.value = sum
} finally {
loading.value = false
}
@@ -215,6 +225,13 @@ const handleExport = async () => {
/** 初始化 **/
onMounted(async () => {
await getList()
- deviceList.value = await EnergyDeviceApi.getTaskList()
+ deviceList.value = await EnergyDeviceApi.getList()
})
+
+/** tab 切换 */
+let activeName = 'first'
+const handleTabClick = (tab: TabsPaneContext) => {
+ // queryParams.status = tab.paneName
+ // handleQuery()
+}
diff --git a/src/views/mes/organization/WorkerIndex.vue b/src/views/mes/organization/WorkerIndex.vue
index 0fc050a9..1a43b40b 100644
--- a/src/views/mes/organization/WorkerIndex.vue
+++ b/src/views/mes/organization/WorkerIndex.vue
@@ -72,7 +72,7 @@
-
+
@@ -85,6 +85,7 @@
+
@@ -101,8 +102,8 @@
highlight-current-row
@current-change="handleCurrentChange"
>
-
-
+
+
@@ -113,7 +114,7 @@
-
+
派工
@@ -182,7 +183,7 @@ const exportLoading = ref(false) // 导出的加载中
const getList = async () => {
loading.value = true
try {
- const data = await OrganizationApi.getOrganizationList(queryParams)
+ const data = await OrganizationApi.getListOrgWorker(queryParams)
list.value = handleTree(data, 'id', 'parentId')
} finally {
loading.value = false
@@ -229,10 +230,11 @@ const toggleExpandAll = async () => {
/** 初始化 **/
onMounted(async () => {
+ queryParams.orgType = 'chengxing'
await getList()
})
/** tab 切换 */
-let activeName = ''
+let activeName = 'chengxing'
const handleTabClick = (tab: TabsPaneContext) => {
queryParams.orgType = tab.paneName
handleQuery()
@@ -252,7 +254,10 @@ const notEmpty = (str:string) => {
/** 派工操作 */
const formRef = ref()
-const openForm = (type: string, id?: number) => {
+const openForm =async (type: string, id?: number,orgName?:string,workerName?:string) => {
+ if(workerName != null && workerName.length > 0){
+ await message.confirm("工位："+orgName+",今天已经派工，确定要重新派工吗？").then()
+ }
formRef.value.open(type, id)
}
diff --git a/src/views/mes/organization/components/OrgWorkerForm.vue b/src/views/mes/organization/components/OrgWorkerForm.vue
index 723718c1..76e89496 100644
--- a/src/views/mes/organization/components/OrgWorkerForm.vue
+++ b/src/views/mes/organization/components/OrgWorkerForm.vue
@@ -38,7 +38,6 @@
value-format="YYYY-MM-DD HH:mm:ss"
type="dates"
placeholder="请选择工作日期"
-
/>
@@ -47,7 +46,6 @@
clearable
filterable
placeholder="请选择工人"
-
>
{
dialogTitle.value = '新增派工'
formType.value = type
resetForm()
+ formData.value.planDates = [formatDate(new Date(),"YYYY-MM-DD HH:mm:ss")]
// 修改时，设置数据
if (orgId) {
formData.value.orgId = orgId
diff --git a/src/views/mes/orgworker/index.vue b/src/views/mes/orgworker/index.vue
index 8098727d..4e107300 100644
--- a/src/views/mes/orgworker/index.vue
+++ b/src/views/mes/orgworker/index.vue
@@ -101,6 +101,8 @@
+
+
diff --git a/src/views/mes/producereport/AdminIndex.vue b/src/views/mes/producereport/AdminIndex.vue
index 55311bd5..3ebebe67 100644
--- a/src/views/mes/producereport/AdminIndex.vue
+++ b/src/views/mes/producereport/AdminIndex.vue
@@ -78,6 +78,7 @@
+
@@ -300,6 +301,7 @@ const getOrganizationTree = async () => {
}
/** 初始化 **/
onMounted(async() => {
+ queryParams.orgType = 'chengxing'
await getList()
await getOrganizationTree()
// 加载用户列表
diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue
index ef7d7389..fff2e3e4 100644
--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@@ -127,7 +127,7 @@
送审
-
+
审核