Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 /*
 /*
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @Autor: renchao
  * @LastEditTime: 2023-05-16 13:36:44
  * @LastEditTime: 2023-05-16 13:36:44
  */
  */
@@ -8,3 +8,16 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
 export function uploadUrl () {
 export function uploadUrl () {
     return process.env.VUE_APP_BASE_API + SERVER.SERVERAPI + '/file/upload'
     return process.env.VUE_APP_BASE_API + SERVER.SERVERAPI + '/file/upload'
 }
 }
+
+/**
+ * @description: 上传单个文件
+ * @param {*} data
+ * @author: renchao
+ */
+export function upload (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/file/upload',
+    method: 'post',
+    data
+  })
+}

+/*
+ * @Description: 申请登记业务规则
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-16 16:02:32
+ */
+
+import request from '@/utils/request'
+let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
+
+/**
+ * @description: 申请业务规则API-根据条件进行列表查询
+ * @param {*} data
+ * @author: renchao
+ */
+export function getSysSqdjywBysearch (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSysSqdjywBysearch',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: 获取登记类型信息-申请业务规则
+ * @param {*} id
+ * @author: renchao
+ */
+export function getDjlxInfo (id) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getDjlxInfo?parentid=' + id,
+    method: 'post'
+  })
+}
+
+/**
+ * @description: 获取登记类型信息-申请业务规则
+ * @param {*} id
+ * @author: renchao
+ */
+export function getQllxByBsmSqyw (id) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getQllxByBsmSqyw?bsmSqyw=' + id,
+    method: 'post'
+  })
+}
+
+
+/**
+ * @description: 读取申请登记业务信息-申请业务规则
+ * @param {*} bsmSqyw
+ * @author: renchao
+ */
+export function getSqdjywDetail (bsmSqyw) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSqdjywDetail?bsmSqyw=' + bsmSqyw,
+    method: 'get'
+  })
+}
+/**
+ * @description: 保存登记业务信息-申请业务规则
+ * @param {*} data
+ * @author: renchao
+ */
+export function saveSqdjyw (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/saveSqdjyw',
+    method: 'post',
+    data
+  })
+}

@@ -8,82 +8,6 @@ import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 /**
 /**
- * @description: 上传单个文件
- * @param {*} data
- * @author: renchao
- */
-export function upload (data) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/file/upload',
-    method: 'post',
-    data
-  })
-}
-
-/**
- * @description: 申请业务规则API-根据条件进行列表查询
- * @param {*} data
- * @author: renchao
- */
-export function getSysSqdjywBysearch (data) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSysSqdjywBysearch',
-    method: 'post',
-    data
-  })
-}
-
-/**
- * @description: 获取登记类型信息-申请业务规则
- * @param {*} id
- * @author: renchao
- */
-export function getDjlxInfo (id) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getDjlxInfo?parentid=' + id,
-    method: 'post'
-  })
-}
-
-/**
- * @description: 获取登记类型信息-申请业务规则
- * @param {*} id
- * @author: renchao
- */
-export function getQllxByBsmSqyw (id) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getQllxByBsmSqyw?bsmSqyw=' + id,
-    method: 'post'
-  })
-}
-
-
-/**
- * @description: 读取申请登记业务信息-申请业务规则
- * @param {*} bsmSqyw
- * @author: renchao
- */
-export function getSqdjywDetail (bsmSqyw) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSqdjywDetail?bsmSqyw=' + bsmSqyw,
-    method: 'get'
-  })
-}
-/**
- * @description: 保存登记业务信息-申请业务规则
- * @param {*} data
- * @author: renchao
- */
-export function saveSqdjyw (data) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/saveSqdjyw',
-    method: 'post',
-    data
-  })
-}
-
-
-/**
  * @description: 其他及附记模板-列表详情
  * @description: 其他及附记模板-列表详情
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
@@ -148,7 +72,7 @@ export function updateSysNotice (data) {
 
 
 // 获取通知列表
 // 获取通知列表
 /**
 /**
- * @description: 
+ * @description:
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
  */
  */

@@ -26,7 +26,7 @@
 
 
 <script>
 <script>
 import { addSysNotice } from "@/api/system.js"
 import { addSysNotice } from "@/api/system.js"
-import { upload } from "@/api/system.js"
+import { upload } from "@/api/file.js"
 export default {
 export default {
   props: {
   props: {
     value: { type: Boolean, default: false },
     value: { type: Boolean, default: false },
@@ -93,4 +93,4 @@ export default {
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 
 
-</style>
\ No newline at end of file
+</style>

@@ -127,7 +127,7 @@ import { uploadUrl } from '@/api/file'
 import djqxsd from './djqxsd.vue'
 import djqxsd from './djqxsd.vue'
 import clgzsd from './clgzsd.vue'
 import clgzsd from './clgzsd.vue'
 import dyztsd from './dyztsd.vue'
 import dyztsd from './dyztsd.vue'
-import { getSqdjywDetail, saveSqdjyw } from '@/api/system'
+import { getSqdjywDetail, saveSqdjyw } from '@/api/sysSqdjyw'
 export default {
 export default {
   components: {
   components: {
     djqxsd,
     djqxsd,

@@ -136,7 +136,7 @@
 <script>
 <script>
   import { uploadUrl } from '@/api/file'
   import { uploadUrl } from '@/api/file'
   import { upward, down } from "@/utils/operation";
   import { upward, down } from "@/utils/operation";
-  import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/system.js";
+  import { getDjlxInfo, getSqdjywDetail, saveSqdjyw } from "@/api/sysSqdjyw.js";
   import { datas, sendThis } from "./sqywDetail";
   import { datas, sendThis } from "./sqywDetail";
   export default {
   export default {
     name: "componentDialog",
     name: "componentDialog",

@@ -40,7 +40,7 @@ import table from "@/utils/mixin/table";
 import editDialog from "./components/editDialog.vue";
 import editDialog from "./components/editDialog.vue";
 import componentDialog from "./sqywDetail.vue";
 import componentDialog from "./sqywDetail.vue";
 import { datas, sendThis } from "./sqywgzdata";
 import { datas, sendThis } from "./sqywgzdata";
-import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/system.js";
+import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js";
 export default {
 export default {
   name: "djbcx",
   name: "djbcx",
   components: {
   components: {

@@ -55,7 +55,7 @@
 </template>
 </template>
 <script>
 <script>
 import { addSysNotice, updateSysNotice } from "@/api/system.js";
 import { addSysNotice, updateSysNotice } from "@/api/system.js";
-import { upload } from "@/api/system.js";
+import { upload } from "@/api/file.js";
 import { quillEditor } from "vue-quill-editor";
 import { quillEditor } from "vue-quill-editor";
 export default {
 export default {
   props: {
   props: {

 <!--
 <!--
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @Autor: renchao
  * @LastEditTime: 2023-07-13 15:26:40
  * @LastEditTime: 2023-07-13 15:26:40
 -->
 -->
@@ -68,7 +68,7 @@
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { selectQlxx } from "@/api/ywbl.js";
   import { selectQlxx } from "@/api/ywbl.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
-  import { getQllxByBsmSqyw } from "@/api/system.js";
+  import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js";
   export default {
   export default {
     mixins: [table, jump],
     mixins: [table, jump],
     props: {
     props: {