seimin 2 年之前
父节点
当前提交
cde37d6785

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

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

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

@@ -78,7 +78,7 @@
78 78
         <div v-if="operate.ok" class="showModel__ok" @click="ok">
79 79
           {{ operate.ok || "" }}
80 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 82
           {{ operate.remove || "" }}
83 83
         </div>
84 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 94
       toast.show();
95 95
       this.$http
96 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 98
             "summaryId": this.$route.params.summaryId
100 99
         })
101 100
         .then(res => {