Merge remote-tracking branch 'origin/dev' into dev

src/api/basic/basicPda.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/logpm-basic/pdf/list',
+    url: '/api/logpm-basic/pda/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/api/logpm-basic/pdf/detail',
+    url: '/api/logpm-basic/pda/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/logpm-basic/pdf/remove',
+    url: '/api/logpm-basic/pda/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/logpm-basic/pdf/submit',
+    url: '/api/logpm-basic/pda/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/logpm-basic/pdf/submit',
+    url: '/api/logpm-basic/pda/submit',
     method: 'post',
     data: row
   })

src/views/basic/pda/basicPda.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/basic/basicdataPda";
+  import {getList, getDetail, add, update, remove} from "@/api/basic/basicPda";
   import option from "@/option/basic/basicPda";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";

src/views/basic/pda/basicPda2.vue

@@ -264,7 +264,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from '@/api/basic/basicdataPda';
+import { getList, getDetail, add, update, remove } from '@/api/basic/basicPda';
 import option from '@/option/basic/basicdataPda2';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';

src/views/basic/pda/basicPdaform.vue

@@ -191,7 +191,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove } from '@/api/basic/basicPdarecords';
-import { getDetail as getDetailPda ,update as  updatepda} from '@/api/basic/basicdataPda';
+import { getDetail as getDetailPda ,update as  updatepda} from '@/api/basic/basicPda';
 import option from '@/option/basic/basicPdarecords';
 import pdaoption from '@/option/basic/basicPda';
 import { mapGetters } from 'vuex';

src/views/basic/pdarecords/basicPdarecords.vue

@@ -289,7 +289,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove } from '@/api/basic/basicPdarecords';
-import { getDetail as getDetailPda } from '@/api/basic/basicdataPda';
+import { getDetail as getDetailPda } from '@/api/basic/basicPda';
 import option from '@/option/basic/basicPdarecords';
 import pdaoption from '@/option/basic/basicPda';
 import { mapGetters } from 'vuex';

src/views/basic/property/basicPropertyDetailsfrom.vue

@@ -191,7 +191,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove } from '@/api/basic/basicPdarecords';
-import { getDetail as getDetailPda ,update as  updatepda} from '@/api/basic/basicdataPda';
+import { getDetail as getDetailPda ,update as  updatepda} from '@/api/basic/basicPda';
 import option from '@/option/basic/basicPdarecords';
 import pdaoption from '@/option/basic/basicPda';
 import { mapGetters } from 'vuex';