seimin 2 years ago
parent
commit
cde37d6785

+ 1 - 4
src/components/WorkHourManagement/index.vue

@@ -48,7 +48,6 @@ export default {
48
     // 移除
48
     // 移除
49
     remove(data) {
49
     remove(data) {
50
       console.log(data);
50
       console.log(data);
51
-      return;
52
       const toast = this.$createToast({
51
       const toast = this.$createToast({
53
         txt: "Loading...",
52
         txt: "Loading...",
54
         mask: true
53
         mask: true
@@ -59,7 +58,7 @@ export default {
59
             "workHourManagementList": [
58
             "workHourManagementList": [
60
                 {
59
                 {
61
                     "workHourId": data.gs.id,
60
                     "workHourId": data.gs.id,
62
-                    "workHourNum": data.workHourNum
61
+                    "workHourNum": data.workHourNum2,
63
                 }
62
                 }
64
             ],
63
             ],
65
             "summaryId": this.summaryId,
64
             "summaryId": this.summaryId,
@@ -114,7 +113,6 @@ export default {
114
                 {
113
                 {
115
                     "workHourId": data.gs.id,
114
                     "workHourId": data.gs.id,
116
                     "workHourNum": data.workHourNum2,
115
                     "workHourNum": data.workHourNum2,
117
-                    "workHourParent": data.gs.workHourParent
118
                 }
116
                 }
119
             ],
117
             ],
120
             "summaryId": this.summaryId,
118
             "summaryId": this.summaryId,
@@ -199,7 +197,6 @@ export default {
199
           workName: item.workName,
197
           workName: item.workName,
200
           workUnit: item.workUnit,
198
           workUnit: item.workUnit,
201
           id: item.id,
199
           id: item.id,
202
-          workHourParent: item.parent?item.parent.id:undefined
203
         },
200
         },
204
         incidentId: this.incidentId,
201
         incidentId: this.incidentId,
205
         summaryId: this.summaryId,
202
         summaryId: this.summaryId,

+ 1 - 1
src/components/showModel/showModel.vue

@@ -78,7 +78,7 @@
78
         <div v-if="operate.ok" class="showModel__ok" @click="ok">
78
         <div v-if="operate.ok" class="showModel__ok" @click="ok">
79
           {{ operate.ok || "" }}
79
           {{ operate.ok || "" }}
80
         </div>
80
         </div>
81
-        <div v-if="operate.remove && selectName === 'hc_edit'" class="showModel__remove" @click.stop="remove">
81
+        <div v-if="operate.remove && (selectName === 'hc_edit' || selectName === 'gs_edit')" class="showModel__remove" @click.stop="remove">
82
           {{ operate.remove || "" }}
82
           {{ operate.remove || "" }}
83
         </div>
83
         </div>
84
         <div v-if="operate.cancel" class="showModel__cancel" @click.stop="cancel">
84
         <div v-if="operate.cancel" class="showModel__cancel" @click.stop="cancel">

+ 1 - 2
src/views/WorkHourManagementTwo.vue

@@ -94,8 +94,7 @@ export default {
94
       toast.show();
94
       toast.show();
95
       this.$http
95
       this.$http
96
         .post("service/bpm/data/addSummaryDoc", {
96
         .post("service/bpm/data/addSummaryDoc", {
97
-            "workHourParent":this.$route.params.parentId,
98
-            "workHourManagementList": this.checkList.map(v => ({workHourId: v, workHourNum: workHourManagementMap[v] || 1, workHourParent: this.$route.params.parentId})),
97
+            "workHourManagementList": this.checkList.map(v => ({workHourId: v, workHourNum: workHourManagementMap[v] || 1})),
99
             "summaryId": this.$route.params.summaryId
98
             "summaryId": this.$route.params.summaryId
100
         })
99
         })
101
         .then(res => {
100
         .then(res => {