diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
index 16c735af..903fd68b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
@@ -792,22 +792,43 @@ const open = async (id: number,propertynew :number) => {
businessType: 'PROJECT_ORDER'
}
formData.value.operateLogs = (await getOperateLogPage(logParams)).list
- if (formData.value.operateLogs && formData.value.operateLogs.length >= 2) {
- if(formData.value.operateLogs.length ==2){
- const approveLog = formData.value.operateLogs[0]
- formData.value.approveTime = approveLog.startTime
- formData.value.approveUserName = approveLog.userNickname
- }else{
- const auditLog = formData.value.operateLogs[0]
- formData.value.auditTime = auditLog.startTime
- formData.value.auditUserName = auditLog.userNickname
- const approveLog = formData.value.operateLogs[1]
- formData.value.approveTime = approveLog.startTime
- formData.value.approveUserName = approveLog.userNickname
- }
- // const auditLog = formData.value.operateLogs[3]
- // formData.value.auditTime = auditLog.startTime
- // formData.value.auditUserName = auditLog.userNickname
+ console.log(formData.value.operateLogs)
+ // if (formData.value.operateLogs && formData.value.operateLogs.length >= 2) {
+ // if(formData.value.operateLogs.length ==2){
+ // const approveLog = formData.value.operateLogs[0]
+ // formData.value.approveTime = approveLog.startTime
+ // formData.value.approveUserName = approveLog.userNickname
+ // }else if(formData.value.operateLogs.length ==3){
+ // const auditLog = formData.value.operateLogs[1]
+ // formData.value.auditTime = auditLog.startTime
+ // formData.value.auditUserName = auditLog.userNickname
+ // const approveLog = formData.value.operateLogs[2]
+ // formData.value.approveTime = approveLog.startTime
+ // formData.value.approveUserName = approveLog.userNickname
+ // }
+ // // const auditLog = formData.value.operateLogs[3]
+ // // formData.value.auditTime = auditLog.startTime
+ // // formData.value.auditUserName = auditLog.userNickname
+ // }
+ if (formData.value.operateLogs){
+ const filteredLogs = formData.value.operateLogs
+ ?.filter(item => item.type == 9)
+ ?.sort((a, b) => new Date(b.startTime) - new Date(a.startTime))
+ ?.[0]; // 可选链操作符，如果为空返回undefined
+ console.log(filteredLogs)
+
+ const logs = formData.value.operateLogs
+ ?.filter(item => item.type == 10)
+ ?.sort((a, b) => new Date(b.startTime) - new Date(a.startTime))
+ ?.[0]; // 可选链操作符，如果为空返回undefined
+ if (logs){
+ formData.value.auditTime = logs.startTime
+ formData.value.auditUserName = logs.userNickname
+ }
+ if (filteredLogs){
+ formData.value.approveTime = filteredLogs.startTime
+ formData.value.approveUserName = filteredLogs.userNickname
+ }
}
formData.value.propertynew = propertynew;
// loading .value = false;
diff --git a/mes-ui/mini-app/src/pages/productionInReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/productionInReport/components/dataItem.vue
index 9ee39b3c..41681c53 100644
--- a/mes-ui/mini-app/src/pages/productionInReport/components/dataItem.vue
+++ b/mes-ui/mini-app/src/pages/productionInReport/components/dataItem.vue
@@ -99,7 +99,19 @@ onMounted(async () => {
queryParams.subOrDetailName=getStoredSearchValue()
await getListData();
});
-
+// onShow(async () => {
+// const today = new Date();
+// const year = today.getFullYear();
+// const month = String(today.getMonth() + 1).padStart(2, "0");
+// const day = String(today.getDate()).padStart(2, "0");
+// isFinish.value = false;
+// isLoading.value = false;
+// queryParams.pageNo = 1;
+// todayStr.value = `${year}-${month}-${day}`;
+// searchVal.value=getStoredSearchValue()
+// queryParams.subOrDetailName=getStoredSearchValue()
+// await getListData();
+// });
const isScanning = ref(false)
const handleDetail = async (item) => {
@@ -253,7 +265,7 @@ const handleSearch = async (e) => {
零件名称: {{ item.materialName }}
- 派工工序: {{ item.procedureName }}
+ 派工工序: {{ item.procedureName }}
@@ -280,7 +292,7 @@ const handleSearch = async (e) => {
{
+ // if (historyList.value.length<=0){
+ // uni.showToast({
+ // icon: 'none',
+ // duration: 3000,
+ // title: '当前未报工,不允许报工结束',
+ // })
+ // return
+ // }
isLoading.value = true;
const params = {
id: detailInfo.value?.id,
@@ -201,7 +209,7 @@
}
const handleLengthChange =async (val) => {
console.log(val)
- if (val) {
+ if (val){
length.value = parseFloat(val).toFixed(2)
if (matType.value == '1' || matType.value == '3') {
if (widht.value > 0 && hight.value > 0) {
@@ -223,12 +231,10 @@
reportPrice.value = price.toFixed(2)
}
}
- }else {
- weight.value=0.00
- reportPrice.value=0.00
}
}
const handleWidhtChange =async (val) => {
+ if (val){
widht.value=parseFloat(val).toFixed(2)
if (matType.value=='1'||matType.value=='3'){
if (length.value>0&&hight.value>0){
@@ -238,8 +244,10 @@
reportPrice.value= price.toFixed(2)
}
}
+ }
}
const handleHightChange =async (val) => {
+ if (val){
hight.value=parseFloat(val).toFixed(2)
if (matType.value=='1'||matType.value=='3'){
if (widht.value>0&&length.value>0){
@@ -261,14 +269,17 @@
reportPrice.value= price.toFixed(2)
}
}
+
+ }
}
const handleWeightChange =async (val) => {
+ if (val){
weight.value=parseFloat(val).toFixed(2)
var price = weight.value * detailInfo.value.price;
reportPrice.value= price.toFixed(2)
+ }
}
const onClear= async (type)=>{
- console.log(type)
uni.hideKeyboard()
weight.value=0.00
reportPrice.value= 0.00
@@ -457,13 +468,13 @@
*重量：
-
Kg
*总价：
-
元