diff --git a/src/api/mes/producereport/index.ts b/src/api/mes/producereport/index.ts
index f86a32bd..7e50808c 100644
--- a/src/api/mes/producereport/index.ts
+++ b/src/api/mes/producereport/index.ts
@@ -22,7 +22,10 @@ export const ProduceReportApi = {
getProduceReportPage: async (params: any) => {
return await request.get({ url: `/mes/produce-report/page`, params })
},
-
+// 查询生产报工单分页
+ getDailyReportPage: async (params: any) => {
+ return await request.get({ url: `/mes/produce-report/pageDailyReport`, params })
+ },
// 查询生产报工单详情
getProduceReport: async (id: number) => {
return await request.get({ url: `/mes/produce-report/get?id=` + id })
diff --git a/src/views/mes/energydevice/ResetForm.vue b/src/views/mes/energydevice/ResetForm.vue
index d2074391..5e79c3c2 100644
--- a/src/views/mes/energydevice/ResetForm.vue
+++ b/src/views/mes/energydevice/ResetForm.vue
@@ -13,7 +13,16 @@
-
+
+
+
+
+
diff --git a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue
index bf4b233a..9c89a580 100644
--- a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue
+++ b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue
@@ -94,21 +94,12 @@ const formRef = ref() // 表单 Ref
/** 打开弹窗 */
-const open = async (type: string, id?: number, deviceId: number) => {
+const open = async (type: string, id?: number, deviceId: number, deviceType: string) => {
dialogVisible.value = true
- dialogTitle.value = t('action.' + type)
+ dialogTitle.value = t('action.' + type) +':'+ deviceType+'抄表'
formType.value = type
resetForm()
formData.value.deviceId = deviceId
- // 修改时，设置数据
- // if (id) {
- // formLoading.value = true
- // try {
- // formData.value = await EnergyDeviceApi.getEnergyDeviceCheckRecord(id)
- // } finally {
- // formLoading.value = false
- // }
- // }
const data = await EnergyDeviceApi.getEnergyDevice(deviceId)
formData.value.lastCheckValue = data.lastCheckValue
formData.value.lastCheckTime = data.lastCheckTime
diff --git a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue
index 0484f0d7..00adc2ab 100644
--- a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue
+++ b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue
@@ -1,33 +1,34 @@
-
- 新增抄表
-
+
+
+
+
+
+
+
+
+
-
-
-
+
@@ -80,6 +81,7 @@ const message = useMessage() // 消息弹窗
const props = defineProps<{
deviceId?: number // 能源设备Id（主表的关联字段）
+ deviceName?: string
}>()
const loading = ref(false) // 列表的加载中
const list = ref([]) // 列表的数据
@@ -128,7 +130,7 @@ const openForm = (type: string, id?: number) => {
message.error('请选择一个能源设备')
return
}
- formRef.value.open(type, id, props.deviceId)
+ formRef.value.open(type, id, props.deviceId,props.deviceName)
}
/** 删除按钮操作 */
diff --git a/src/views/mes/energydevice/index.vue b/src/views/mes/energydevice/index.vue
index 079b8e25..60bfc7ab 100644
--- a/src/views/mes/energydevice/index.vue
+++ b/src/views/mes/energydevice/index.vue
@@ -68,8 +68,8 @@
highlight-current-row
@current-change="handleCurrentChange"
>
-
+
@@ -91,22 +91,15 @@
-
-
+
- 编辑
+ 抄表
重置
+
+ 编辑
+
-
+
-
+
+
+
+
-
-
+
+
@@ -158,6 +162,8 @@ import { EnergyDeviceApi, EnergyDeviceVO } from '@/api/mes/energydevice'
import EnergyDeviceForm from './EnergyDeviceForm.vue'
import ResetForm from './ResetForm.vue'
import EnergyDeviceCheckRecordList from './components/EnergyDeviceCheckRecordList.vue'
+import EnergyDeviceCheckRecordForm
+ from "@/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue";
/** 能源设备 列表 */
defineOptions({ name: 'EnergyDevice' })
@@ -192,6 +198,9 @@ const getList = async () => {
const data = await EnergyDeviceApi.getEnergyDevicePage(queryParams)
list.value = data.list
total.value = data.total
+ if(list.value.length>0){
+ currentRow.value = list.value[0]
+ }
} finally {
loading.value = false
}
@@ -257,4 +266,11 @@ const handleCurrentChange = (row) => {
onMounted(() => {
getList()
})
+
+/** 添加/修改操作 */
+const newRecordFormRef = ref()
+const newRecordForm = (id: number, deviceType: string) => {
+ //type: string, id?: number, deviceId: number, deviceType: string
+ newRecordFormRef.value.open("create", null, id, deviceType)
+}
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 3c5931a6..26ad7efd 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -206,7 +206,7 @@
type="primary"
@click="handleStatus(scope.row.code, scope.row.id, 'start',2,'开工')"
v-hasPermi="['mes:plan:update']"
- v-if="scope.row.status === 1 || scope.row.status ===4"
+ v-if="scope.row.status === 1 || scope.row.status ===3"
>
开工
diff --git a/src/views/mes/producereport/DailyReportIndex.vue b/src/views/mes/producereport/DailyReportIndex.vue
index 77f1f2d5..4170726e 100644
--- a/src/views/mes/producereport/DailyReportIndex.vue
+++ b/src/views/mes/producereport/DailyReportIndex.vue
@@ -19,6 +19,7 @@
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
+ @change="handleQuery"
/>
@@ -30,6 +31,7 @@
:key="item.id"
:label="item.nickname"
:value="item.id"
+ @change="handleQuery"
/>
@@ -56,6 +58,7 @@
:key="item.id"
:label="item.name"
:value="item.id"
+ @change="handleQuery"
/>
@@ -69,7 +72,7 @@
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.value"
- @change="changeDate"
+ @change="handleQuery"
>
{{ dict.label }}
@@ -96,6 +99,21 @@
+
+
+ 本页，产品总数：{{totalNumber}}
+
+
+ 成品总数：{{totalQuality}}
+
+
+ 废品总数：{{totalWaste}}
+
+
+ 成品率：{{erpNumberFormatter(Number(totalQuality)/Number(totalNumber)*100,3)+'%'}}
+
+
+
+ 本页总计时数：{{totalTime}}
+
([]) // 列表的数据
const totalJiShi = ref(0) // 列表的总页数
+const totalNumber = ref(0) // 总数
+const totalQuality = ref(0) // 成品总数
+const totalWaste = ref(0) //废品总数
+const totalTime = ref(0) //计时总数
+
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@@ -238,6 +263,7 @@ const queryParams = reactive({
orgId: undefined,
orgType: undefined,
wasteReason: undefined,
+ totalTime: undefined,
remark: undefined,
isEnable: undefined,
createTime: [],
@@ -256,16 +282,33 @@ const getList = async () => {
queryParams.reportStatus = 2
//计时报表
if(typeName.value ==='jishi'){
- const data = await ProduceReportApi.getProduceReportPage(queryParams)
+ queryParams.totalTime=0
+ const data = await ProduceReportApi.getDailyReportPage(queryParams)
listJiShi.value = data.list
totalJiShi.value = data.total
-
+ let sumTime= 0;
+ // 遍历列表，累加每个实体对象的 value 属性值
+ for (let entity of listJiShi.value) {
+ sumTime += entity.totalTime
+ }
+ totalTime.value = sumTime
}
//计件报表
else{
const data = await ProduceReportDetailApi.getProduceReportDetailPage(queryParams)
list.value = data.list
total.value = data.total
+ // 初始化总和为 0
+ let sumQuality= 0;
+ let sumWaste= 0;
+ // 遍历列表，累加每个实体对象的 value 属性值
+ for (let entity of list.value) {
+ sumQuality += entity.qualityNumber;
+ sumWaste += entity.wasteNumber
+ }
+ totalQuality.value = sumQuality
+ totalWaste.value = sumWaste
+ totalNumber.value = Number(totalQuality.value)+Number(totalWaste.value)
}
} finally {
loading.value = false
@@ -293,6 +336,7 @@ const handleExport = async () => {
exportLoading.value = true
//只v查通过了的
queryParams.reportStatus = 2
+ queryParams.totalTime=0
//计时报表
if(typeName.value ==='jishi'){
const data = await ProduceReportApi.exportProduceReport(queryParams)
diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue
index 630688a3..f359c0e9 100644
--- a/src/views/system/user/UserForm.vue
+++ b/src/views/system/user/UserForm.vue
@@ -140,6 +140,7 @@ const formRules = reactive({
],
mobile: [
{
+ required: true,
pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur'