mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue

@@ -807,13 +807,9 @@ const submitForm = async (operate) => {
 const onAddItem = async() => {
   //条件修改：没有时间就不填
     var date =  new Date();
-    date.setHours(0,0,0,0)
-    var date2 = new Date();
   if(processDesignType.value == 'BLUEPRINT_WORKBLANK'){
     if(formData.value.blankDate != null ){
-      var date1 =  new Date(formData.value.blankDate);
+      if(formData.value.blankDate < date.getTime()){
-      date1.setHours(0,0,0,0)
-      if(date1.getTime()< date.getTime()){
          if(formData.value.isDelay == null || formData.value.isDelay == 0){
             message.error("当前任务已超期,请延期后重试!")
            return
@@ -826,9 +822,7 @@ const onAddItem = async() => {
   }
   if(processDesignType.value == 'BLUEPRINT_2D'){
     if(formData.value.twoDimDate != null ){
-     var date1 =  new Date(formData.value.twoDimDate);
+      if(formData.value.twoDimDate < date.getTime()){
-      date1.setHours(0,0,0,0)
-              if(date1.getTime()< date.getTime()){
          if(formData.value.isDelay == null || formData.value.isDelay == 0){
             message.error("当前任务已超期,请延期后重试!")
            return
@@ -842,9 +836,7 @@ const onAddItem = async() => {
   }
     if(processDesignType.value == 'BLUEPRINT_3D'){
     if(formData.value.threeDimDate != null ){
-             var date1 =  new Date(formData.value.threeDimDate);
+      if(formData.value.threeDimDate < date.getTime()){
-      date1.setHours(0,0,0,0)
-              if(date1.getTime()< date.getTime()){
           if(formData.value.isDelay == null || formData.value.isDelay == 0){
             message.error("当前任务已超期,请延期后重试!")
            return
@@ -858,9 +850,9 @@ const onAddItem = async() => {
   if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){
     console.log(formData.value.craftEndDate)
     if(formData.value.craftEndDate != null ){
-      var date1 =  new Date(formData.value.craftEndDate);
+      console.log(date.getTime())
-      date1.setHours(0,0,0,0)
+      console.log(formData.value.craftEndDate)
-      if(date1.getTime()< date.getTime()){
+      if(formData.value.craftEndDate < date.getTime()){
           if(formData.value.isDelay == null || formData.value.isDelay == 0){
             message.error("当前任务已超期,请延期后重试!")
            return
@@ -900,8 +892,8 @@ const onAddItem = async() => {
     progress: undefined,
     blueprintLink: undefined,
     remark: '',
-    createTime: date2.getTime(),
+    createTime: date.getTime(),
-    beginTime:date2.getTime(),
+    beginTime:date.getTime(),
     endTime:undefined,
     isOver:0,
     workTime:undefined,

mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue

@@ -1353,8 +1353,7 @@ const submitForm = async (operate) => {
 
           d1.setHours(0, 0, 0, 0);
           d2.setHours(0, 0, 0, 0);
-					console.log(d1)
+
-					console.log(d2)
           if (d1 > d2) {
             let name;
             procedureList.value.forEach((items) => {

mes-ui/mini-app/src/pages/assembleReport/assembleReport-detail.vue

@@ -102,9 +102,9 @@ const getData = async () => {
   	  }else{
  		  amount.value = 0
  	  }
-
+ 
   }
-
+	
 
   isLoading.value = false
 }
@@ -159,29 +159,17 @@ const handleComplate = async () => {
   try {
   const data = await postOperateAPI(params);
   } catch (error) {
-	  console.log(error)
-	 uni.showToast({
-	   icon: 'none',
-	   duration: 3000,
-	   title: error.data.msg,
-	 })
   } finally {
-  await getDetailData(detailInfo.value.id)
+  isLoading.value = false;
-  await getData()
-  const obj = historyList.value[0]
-    // 最新的报工是否完成
-  if (obj && obj?.workTime == null && obj.endTime) {
-       popupShow.value = true
   }
-  }
+  const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
-    isLoading.value = false;
+  uni.redirectTo({
-  // const url = `/pages/productionReport/productionReport-detail?id=${detailInfo.value.id}`
+    url,
-  // uni.redirectTo({
+  })
-  //   url,
-  // })
 }
 // 提交报工
 const handleOk = async (active) => {
+console.log(amount.value)
   const params = {
     id: detailInfo.value?.id,
     active: 'SUBMIT',
@@ -330,7 +318,7 @@ const handleStop = async () => {
   	  <p>上一道工序尚未完工，请等待上一道工序完工后进行报工！</p>
   </view>
 	</view>
-
+  
 </template>
 <style lang="scss">
 // 订单列表