工艺设计结束时间问题和派工单打印问题

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

@@ -436,7 +436,7 @@ const disabledDate = (time: Date,row : any) => {
   tomorrow.setHours(23, 59, 59, 999);
   if(row.beginTime != null){
       const beginDate = new Date(row.beginTime);
-
+    beginDate.setHours(0,0,0,0);  
   return time.getTime() < beginDate.getTime() || time.getTime() > tomorrow.getTime();
   }else{
     return  time.getTime() > tomorrow.getTime();

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

@@ -36,16 +36,16 @@
             <td colspan="2" :rowspan="2">
               <span>名称</span>
             </td>
-            <td colspan="2">毛坯</td>
+            <!-- <td colspan="2">毛坯</td>
             <td colspan="2">普铣</td>
             <td colspan="4">常规</td>
             <td colspan="2">数控 </td>
             <td colspan="2">电加工 </td>
             <td colspan="1">焊 </td>
-            <td colspan="2">钳工</td>
+            <td colspan="2">钳工</td> -->
           </tr>
           <tr>
-            <td colspan="1">下料</td>
+            <!-- <td colspan="1">下料</td>
             <td colspan="1">木模</td>
             <td colspan="1">粗铣</td>
             <td colspan="1">精铣</td>
@@ -59,7 +59,24 @@
             <td colspan="1">刻字</td>
             <td colspan="1">电焊</td>
             <td colspan="1">钻孔</td>
-            <td colspan="1">抛光</td>
+            <td colspan="1">抛光</td> 
+            const procedureArrary = ['下料','电焊','编程','开粗','铣床','车床','磨床','数控1','数控2','刻字','网格','深钻孔','钻孔','热处理','火花']
+            -->
+            <td colspan="1">下料</td>
+            <td colspan="1">电焊</td>
+            <td colspan="1">编程</td>
+            <td colspan="1">铣床</td>
+            <td colspan="1">车床</td>
+            <td colspan="1">开粗</td>
+            <td colspan="1">热处理</td>
+            <td colspan="1">磨床</td>
+            <td colspan="1">数控1</td>
+            <td colspan="1">数控2</td>
+            <td colspan="1">火花</td>
+            <td colspan="1">刻字</td>
+            <td colspan="1">网格</td>
+            <td colspan="1">深钻孔</td>
+            <td colspan="1">钻孔</td>
           </tr>
           <tr v-for="item in formDataprocess.tablename" :key="item">
             <td colspan="1"> {{item.index}} </td>
@@ -864,22 +881,24 @@ const open = async (id?: number) => {
         //  根据任务单详情子表的procedureId，找到工序详情中name
         const Procedure = await ProcedureApi.getProcedure(taskitem.procedureId)
         // 处理数据
+        
         if (Procedure.name == '下料') {
           summarylist.value[0].name = Procedure.name
+          console.log(';s')
           if (!summarylist.value[0].data) {
             summarylist.value[0].data = taskitem.summary
           } else if (summarylist.value[0].data && taskitem.summary) {
             summarylist.value[0].data = summarylist.value[0].data + ',' + taskitem.summary
           }
-          const initialUser = await UserApi.getUser(taskitem.owner)
+           if (!formDataprocess.value.tablename[0].layingoff) {
-          if (!formDataprocess.value.tablename[0].layingoff) {
             formDataprocess.value.tablename[0].layingoff = taskitem.sort
           } else if (formDataprocess.value.tablename[0].layingoff && taskitem.sort) {
             formDataprocess.value.tablename[0].layingoff =
               formDataprocess.value.tablename[0].layingoff + ',' + taskitem.sort
           }
-
+          if(taskitem.owner){
-          if (!formDataprocess.value.tablename[6].layingoff) {
+             const initialUser = await UserApi.getUser(taskitem.owner)
+            if (!formDataprocess.value.tablename[6].layingoff) {
             formDataprocess.value.tablename[6].layingoff = initialUser.nickname
           } else if (
             formDataprocess.value.tablename[6].layingoff &&
@@ -888,13 +907,16 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].layingoff = initialUser.nickname
           } else {
           }
+          }
+
           Procedata.list.forEach((item: any) => {
             if (item.name == Procedure.name) {
               formDataprocess.value.tablename[2].layingoff = item.standard1Time
               formDataprocess.value.tablename[3].layingoff = item.standard2Time
             }
           })
-        } else if (Procedure.name == '木模') {
+          
+        } else if (Procedure.name == '电焊') {
           summarylist.value[1].name = Procedure.name
           if (!summarylist.value[1].data) {
             summarylist.value[1].data = taskitem.summary
@@ -913,7 +935,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].woodformer = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].woodformer) {
             formDataprocess.value.tablename[6].woodformer = initialUser.nickname
           } else if (
@@ -923,7 +946,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].woodformer = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '粗铣') {
+          }
+
+        } else if (Procedure.name == '编程') {
           summarylist.value[2].name = Procedure.name
           if (!summarylist.value[2].data) {
             summarylist.value[2].data = taskitem.summary
@@ -942,17 +967,20 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].roughmill = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
-          if (!formDataprocess.value.tablename[6].roughmill) {
+            const initialUser = await UserApi.getUser(taskitem.owner)
-            formDataprocess.value.tablename[6].roughmill = initialUser.nickname
+            if (!formDataprocess.value.tablename[6].roughmill) {
-          } else if (
+              formDataprocess.value.tablename[6].roughmill = initialUser.nickname
-            formDataprocess.value.tablename[6].roughmill &&
+            } else if (
-            !formDataprocess.value.tablename[8].roughmill
+              formDataprocess.value.tablename[6].roughmill &&
-          ) {
+              !formDataprocess.value.tablename[8].roughmill
-            formDataprocess.value.tablename[8].roughmill = initialUser.nickname
+            ) {
-          } else {
+              formDataprocess.value.tablename[8].roughmill = initialUser.nickname
-          }
+            } else {
-        } else if (Procedure.name == '精铣') {
+            }
+            }
+
+        } else if (Procedure.name == '铣床') {
           summarylist.value[3].name = Procedure.name
           if (!summarylist.value[3].data) {
             summarylist.value[3].data = taskitem.summary
@@ -971,7 +999,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].finishmill = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].finishmill) {
             formDataprocess.value.tablename[6].finishmill = initialUser.nickname
           } else if (
@@ -981,6 +1010,8 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].finishmill = initialUser.nickname
           } else {
           }
+          }
+
         } else if (Procedure.name == '车床') {
           summarylist.value[4].name = Procedure.name
           if (!summarylist.value[4].data) {
@@ -1000,8 +1031,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].lathe = item.standard2Time
             }
           })
-
+          if(taskitem.owner){
-          const initialUser = await UserApi.getUser(taskitem.owner)
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].lathe) {
             formDataprocess.value.tablename[6].lathe = initialUser.nickname
           } else if (
@@ -1011,7 +1042,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].lathe = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '热处理') {
+          }
+
+        } else if (Procedure.name == '开粗') {
           summarylist.value[5].name = Procedure.name
           if (!summarylist.value[5].data) {
             summarylist.value[5].data = taskitem.summary
@@ -1030,7 +1063,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].treatment = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].treatment) {
             formDataprocess.value.tablename[6].treatment = initialUser.nickname
           } else if (
@@ -1040,7 +1074,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].treatment = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '磨床') {
+          }
+
+        } else if (Procedure.name == '热处理') {
           summarylist.value[5].name = Procedure.name
           if (!summarylist.value[5].data) {
             summarylist.value[5].data = taskitem.summary
@@ -1059,7 +1095,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].grindingmachine = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].grindingmachine) {
             formDataprocess.value.tablename[6].grindingmachine = initialUser.nickname
           } else if (
@@ -1069,7 +1106,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].grindingmachine = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '线割') {
+          }
+
+        } else if (Procedure.name == '数控1') {
           summarylist.value[6].name = Procedure.name
           if (!summarylist.value[6].data) {
             summarylist.value[6].data = taskitem.summary
@@ -1088,7 +1127,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].wire = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].wire) {
             formDataprocess.value.tablename[6].wire = initialUser.nickname
           } else if (
@@ -1098,7 +1138,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].wire = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '开粗') {
+          }
+
+        } else if (Procedure.name == '数控2') {
           summarylist.value[7].name = Procedure.name
           if (!summarylist.value[7].data) {
             summarylist.value[7].data = taskitem.summary
@@ -1118,7 +1160,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].rough = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].rough) {
             formDataprocess.value.tablename[6].rough = initialUser.nickname
           } else if (
@@ -1128,7 +1171,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].rough = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '精加工') {
+          }
+
+        } else if (Procedure.name == '火花') {
           summarylist.value[8].name = Procedure.name
           if (!summarylist.value[8].data) {
             summarylist.value[8].data = taskitem.summary
@@ -1147,7 +1192,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].fashioning = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+            const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].fashioning) {
             formDataprocess.value.tablename[6].fashioning = initialUser.nickname
           } else if (
@@ -1157,7 +1203,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].fashioning = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '火花') {
+          }
+          
+        } else if (Procedure.name == '刻字') {
           summarylist.value[9].name = Procedure.name
           if (!summarylist.value[9].data) {
             summarylist.value[9].data = taskitem.summary
@@ -1176,7 +1224,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].spark = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].spark) {
             formDataprocess.value.tablename[6].spark = initialUser.nickname
           } else if (
@@ -1186,7 +1235,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].spark = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '刻字') {
+          }
+
+        } else if (Procedure.name == '网格') {
           summarylist.value[9].name = Procedure.name
           if (!summarylist.value[9].data) {
             summarylist.value[9].data = taskitem.summary
@@ -1205,7 +1256,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].lettering = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].lettering) {
             formDataprocess.value.tablename[6].lettering = initialUser.nickname
           } else if (
@@ -1215,7 +1267,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].lettering = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '电焊') {
+          }
+
+        } else if (Procedure.name == '深钻孔') {
           summarylist.value[10].name = Procedure.name
           if (!summarylist.value[10].data) {
             summarylist.value[10].data = taskitem.summary
@@ -1234,7 +1288,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].electrowelding = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].electrowelding) {
             formDataprocess.value.tablename[6].electrowelding = initialUser.nickname
           } else if (
@@ -1244,6 +1299,8 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].electrowelding = initialUser.nickname
           } else {
           }
+          }
+
         } else if (Procedure.name == '钻孔') {
           summarylist.value[11].name = Procedure.name
           if (!summarylist.value[11].data) {
@@ -1263,7 +1320,8 @@ const open = async (id?: number) => {
               formDataprocess.value.tablename[3].drill = item.standard2Time
             }
           })
-          const initialUser = await UserApi.getUser(taskitem.owner)
+          if(taskitem.owner){
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].drill) {
             formDataprocess.value.tablename[6].drill = initialUser.nickname
           } else if (
@@ -1273,7 +1331,9 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].drill = initialUser.nickname
           } else {
           }
-        } else if (Procedure.name == '抛光') {
+          }
+
+        } else if (Procedure.name == '磨床') {
           summarylist.value[12].name = Procedure.name
           if (!summarylist.value[12].data) {
             summarylist.value[12].data = taskitem.summary
@@ -1293,8 +1353,8 @@ const open = async (id?: number) => {
             }
           })
 
-          console.log(taskitem.owner)
+          if(taskitem.owner){
-          const initialUser = await UserApi.getUser(taskitem.owner)
+                      const initialUser = await UserApi.getUser(taskitem.owner)
           if (!formDataprocess.value.tablename[6].polishing) {
             formDataprocess.value.tablename[6].polishing = initialUser.nickname
           } else if (
@@ -1304,6 +1364,8 @@ const open = async (id?: number) => {
             formDataprocess.value.tablename[8].polishing = initialUser.nickname
           } else {
           }
+          }
+
         }
       })
     }