Browse Source

提交报工的代码

Lijy 1 year ago
parent
commit
75081ec4b6

+ 7 - 3
fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -163,11 +163,15 @@ export default {
       console.log(this.reportForm.checkedSteelNum);
     },
     getMyPlanProcedureList() {
-      const { id, reportBoolean } = this.$route.query;
-      this.$axios.post("/plan-procedure-total/getFillProcedureDetail", { 
+      const { id, reportBoolean, date } = this.$route.query;
+      let params = {
         id: id,
         inputSteelNum:this.inputSteelNum
-      })
+      }
+      if(reportBoolean == 'true') {
+        params.createDate = date
+      }
+      this.$axios.post("/plan-procedure-total/getFillProcedureDetail", params)
         .then(res => {
           if (res.code == "ok") {
             this.reportForm = res.data;

+ 4 - 2
fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/workView.vue

@@ -250,7 +250,8 @@ export default {
             finishNum: item.finishNum,
             id: item.id,
             userProcedureTeamId: item.userProcedureTeamId,
-            status: item.status
+            status: item.status,
+            createDate: item.createDate
           })
         }
         obj.procedureList = arr
@@ -270,7 +271,8 @@ export default {
         query: {
           id: this.reportBoolean ? item.userProcedureTeamId : item.id,
           reportBoolean: this.reportBoolean,
-          ohterId: item.id
+          ohterId: item.id,
+          date: item.createDate,
         }
       })
     },