‘合并冲突’

applications/dee-mes/src/privateComponents/components/GenerateCreateOrproductionButton/index.vue

@@ -18,7 +18,7 @@
   </div>
 </template>
 <script>
-import { post } from '@/utils/http'
+import { post, get } from '@/utils/http'
 
 export default {
   componentName: '新增项目维护生成按钮',
@@ -59,7 +59,7 @@ export default {
       }
       post(`/ORProduction/create`, params).then(res => {
         const id = res.items.id
-        post(`/MilestonePlan/generate?orProductionId=${id}`).then(res => {
+        get(`/MilestonePlan/generate?orProductionId=${id}`).then(res => {
           this.$util.showMessageSuccess(res.message)
           this.$emit('cancel')
         }).catch((err) => {