ZaiZai 1 year ago
parent
commit
88285bbfb0

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240511090321"
+  "value": "20240516175540"
 }

+ 20 - 20
src/api/modules/alter/admin/order.js

@@ -2,83 +2,83 @@ import { HcApi } from '../../../request/index'
 //  变更令
 export default {
     //分页
-    async getPage(form, msg = false) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/page',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //修改
-    async edit(form, msg = false) {
+    async edit(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/update',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //新增
-    async add(form, msg = false) {
+    async add(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/add',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除
-    async remove(form, msg = false) {
+    async remove(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/delete',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
     //获取详情
-    async getDetail(form, msg = false) {
+    async getDetail(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //新增确认选择清单
-    async getSelectForm(form, msg = false) {
+    async getSelectForm(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/selectForm',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //新增添加清单
-    async addForm(form, msg = false) {
+    async addForm(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/addForm',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //新增-获取变更申请部位
-    async getChangeNode(form, msg = false) {
+    async getChangeNode(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/getChangeNode',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //下达变更
-    async executeChange(form, msg = false) {
+    async executeChange(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/executeChange',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
     //撤销变更
-    async annulChange(form, msg = false) {
+    async annulChange(form) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/annulChange',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
 }

+ 20 - 20
src/api/modules/debit-pay/admin/certificate.js

@@ -2,82 +2,82 @@ import { HcApi } from '../../../request/index'
 //  中期支付证书
 export default {
     //分页
-    async getPage(form, msg = false) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/interimPayCertificate/page',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //修改
-    async edit(form, msg = false) {
+    async edit(form) {
         return HcApi({
             url: '/api/blade-meter/interimPayCertificate/update',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //新增
-    async add(form, msg = false) {
+    async add(form) {
         return HcApi({
             url: '/api/blade-meter/interimPayCertificate/add',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除
-    async remove(form, msg = false) {
+    async remove(form) {
         return HcApi({
             url: '/api/blade-meter/interimPayCertificate/delete',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
     //获取详情
-    async getDetail(form, msg = false) {
+    async getDetail(form) {
         return HcApi({
             url: '/api/blade-meter/interimPayCertificate/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //锁定
-    async setLocking(form, msg = false) {
+    async setLocking(form) {
         return HcApi({
             url: '/api/blade-meter/interimPayCertificate/locking',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
     //所有合同计量期
-    async getAllPeriod(form, msg = false) {
+    async getAllPeriod(form) {
         return HcApi({
             url: '/api/blade-meter/contractMeterPeriod/allPeriod',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
         //未被计量的合同计量期
-     async getConditionPeriod(form, msg = false) {
+     async getConditionPeriod(form) {
             return HcApi({
                 url: '/api/blade-meter/contractMeterPeriod/conditionPeriod',
                 method: 'get',
                 params: form,
-            }, msg)
+            })
         },
     //材料计量期
-    async getMeterPeriod(form, msg = true) {
+    async getMeterPeriod(form = true) {
         return HcApi({
             url: '/api/blade-meter/meterPeriod/approvalPeriod',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
-    async recalculate(form, msg = true) {
+    async recalculate(form = true) {
         return HcApi({
             url: '/api/blade-meter/task/meterPdfInfo',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
 }

+ 30 - 30
src/api/modules/debit-pay/admin/middlepay.js

@@ -2,123 +2,123 @@ import { HcApi } from '../../../request/index'
 //  中间计量申请
 export default {
     //分页
-    async getPage(form, msg = false) {
+    async getPage(form) {
         return HcApi({
             url: '/api//blade-meter/middleMeterApply/page',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //修改
-    async edit(form, msg = false) {
+    async edit(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/update',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //新增
-    async add(form, msg = false) {
+    async add(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/add',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除
-    async remove(form, msg = false) {
+    async remove(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/remove',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
     //获取详情
-    async getDetail(form, msg = false) {
+    async getDetail(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //获取清单明细
-    async getFormDetail(form, msg = false) {
+    async getFormDetail(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/formDetail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //添加清单
-    async addFormList(form, msg = false) {
+    async addFormList(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/addFormList',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //添加分解清单
-    async addResolveForm(form, msg = false) {
+    async addResolveForm(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/addResolveForm',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
     //获取当前节点工程划分
-    async getNodeDivide(form, msg = false) {
+    async getNodeDivide(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/getNodeDivide',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //获取当前节点变更令
-    async getNodeToken(form, msg = false) {
+    async getNodeToken(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/getNodeToken',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //获取计量单编号
-    async getMeterNumber(form, msg = false) {
+    async getMeterNumber(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/getMeterNumber',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //合同计量期列表-全部
-    async getAllPeriod(form, msg = false) {
+    async getAllPeriod(form) {
         return HcApi({
             url: '/api/blade-meter/contractMeterPeriod/allPeriod',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //获取本期计量总金额
-    async getCurrentMeterMoney(form, msg = false) {
+    async getCurrentMeterMoney(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/getCurrentMeterMoney',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //获取当前节点下,当期未被计量的所有清单
-    async getCurrentNodeAllForm(form, msg = false) {
+    async getCurrentNodeAllForm(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/getCurrentNodeAllForm',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //自动批量计量
-    async autoBatchMeter(form, msg = false) {
+    async autoBatchMeter(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/autoBatchMeter',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
 }

+ 12 - 12
src/api/modules/debit-pay/admin/periods.js

@@ -2,44 +2,44 @@ import { HcApi } from '../../../request/index'
 //  合同计量期
 export default {
     //分页
-    async getPage(form, msg = true) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/contractMeterPeriod/periodPage',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //修改
-    async edit(form, msg = true) {
+    async edit(form) {
         return HcApi({
             url: '/api/blade-meter/contractMeterPeriod/edit',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //合同计量期列表-全部
-    async allPeriod(form, msg = true) {
+    async allPeriod(form) {
         return HcApi({
             url: '/api/blade-meter/contractMeterPeriod/allPeriod',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //计量期列表-未关联报表
-    async conditionPeriod(form, msg = true) {
+    async conditionPeriod(form) {
         return HcApi({
             url: '/api/blade-meter/contractMeterPeriod/conditionPeriod',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //锁定
-    async locking(form, msg = true) {
+    async locking(form) {
         return HcApi({
             url: '/api/blade-meter/meterPeriod/locking',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
-   
-}
+
+}

+ 6 - 6
src/api/modules/debit-pay/ledger/datarelate.js

@@ -2,20 +2,20 @@ import { HcApi } from '../../../request/index'
 //  合同材料
 export default {
     //资料关联台账-分页
-    async dataLinkPage(form, msg = true) {
+    async dataLinkPage(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/dataLinkPage',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
        //资料关联台账-关联质检资料
-       async dataLinkFile(form, msg = true) {
+       async dataLinkFile(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/dataLinkFile',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
-  
-}
+
+}

+ 5 - 5
src/api/modules/debit-pay/ledger/static.js

@@ -2,13 +2,13 @@ import { HcApi } from '../../../request/index'
 //  合同材料
 export default {
     //扣回统计
-    async deductStatistics(form, msg = true) {
+    async deductStatistics(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/deductStatistics',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
- 
-  
-}
+
+
+}

+ 9 - 9
src/api/modules/debit-pay/material/book.js

@@ -2,35 +2,35 @@ import { HcApi } from '../../../request/index'
 //  合同材料
 export default {
     //分页
-    async getPage(form, msg = true) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/materialStartStatement/page',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //新增或修改
-    async submit(form, msg = true) {
+    async submit(form) {
         return HcApi({
             url: '/api/blade-meter/materialStartStatement/addOrUpdate',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除
-    async remove(form, msg = true) {
+    async remove(form) {
         return HcApi({
             url: '/api/blade-meter/materialStartStatement/remove',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
     //重新计算
-    async meterPdfInfo(form, msg = true) {
+    async meterPdfInfo(form) {
         return HcApi({
             url: '/api/blade-meter/task/meterPdfInfo',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
-}
+}

+ 8 - 8
src/api/modules/debit-pay/material/contract.js

@@ -2,36 +2,36 @@ import { HcApi } from '../../../request/index'
 //  合同材料
 export default {
     //分页
-    async getPage(form, msg = true) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/contractMaterial/list',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //新增或修改
-    async submit(form, msg = true) {
+    async submit(form) {
         return HcApi({
             url: '/api/blade-meter/contractMaterial/submit',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除
-    async remove(form, msg = true) {
+    async remove(form) {
         return HcApi({
             url: '/api/blade-meter/contractMaterial/remove',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
      //材料树
-     async materialTree(form, msg = true) {
+     async materialTree(form) {
         return HcApi({
             url: '/api/blade-meter/contractMaterial/materialTree',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //日期树
     async dateTree(form) {

+ 16 - 16
src/api/modules/debit-pay/material/order.js

@@ -2,43 +2,43 @@ import { HcApi } from '../../../request/index'
 //  材料计量单
 export default {
     //分页
-    async getPage(form, msg = true) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/materialMeterForm/meterPage',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //详情
-    async detail(form, msg = true) {
+    async detail(form) {
         return HcApi({
             url: '/api/blade-meter/materialMeterForm/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //新增
-    async add(form, msg = true) {
+    async add(form) {
         return HcApi({
             url: '/api/blade-meter/materialMeterForm/add',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //修改
-    async update(form, msg = true) {
+    async update(form) {
         return HcApi({
             url: '/api/blade-meter/materialMeterForm/update',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除
-    async remove(form, msg = true) {
-    return HcApi({
-        url: '/api//blade-meter/materialMeterForm/remove',
-        method: 'post',
-        params: form,
-    }, msg)
-},
-}
+    async remove(form) {
+        return HcApi({
+            url: '/api//blade-meter/materialMeterForm/remove',
+            method: 'post',
+            params: form,
+        }, false)
+    },
+}

+ 12 - 12
src/api/modules/debit-pay/material/periods.js

@@ -2,44 +2,44 @@ import { HcApi } from '../../../request/index'
 //  合同材料
 export default {
     //分页
-    async getPage(form, msg = true) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/meterPeriod/periodPage',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //修改
-    async edit(form, msg = true) {
+    async edit(form) {
         return HcApi({
             url: '/api/blade-meter/meterPeriod/edit',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //计量期列表-全部
-    async allPeriod(form, msg = true) {
+    async allPeriod(form) {
         return HcApi({
             url: '/api/blade-meter/meterPeriod/allPeriod',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //计量期列表-未关联报表
-    async conditionPeriod(form, msg = true) {
+    async conditionPeriod(form) {
         return HcApi({
             url: '/api/blade-meter/meterPeriod/conditionPeriod',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //锁定
-    async locking(form, msg = true) {
+    async locking(form) {
         return HcApi({
             url: '/api/blade-meter/meterPeriod/locking',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
-   
-}
+
+}

+ 13 - 13
src/api/modules/debit-pay/start-work/order.js

@@ -2,52 +2,52 @@ import { HcApi } from '../../../request/index'
 // 开工预付款计量单接口
 export default {
     //分页
-    async getPage(form, msg = true) {
+    async getPage(form) {
         return HcApi({
             url: '/api/blade-meter/startPayMeterForm/page',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
       //详情
-    async detail(form, msg = true) {
+    async detail(form) {
         return HcApi({
             url: '/api/blade-meter/startPayMeterForm/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //新增
-    async add(form, msg = true) {
+    async add(form) {
         return HcApi({
             url: '/api/blade-meter/startPayMeterForm/add',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //修改
-    async update(form, msg = true) {
+    async update(form) {
         return HcApi({
             url: '/api/blade-meter/startPayMeterForm/update',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //删除
-    async remove(form, msg = true) {
+    async remove(form) {
         return HcApi({
             url: '/api/blade-meter/startPayMeterForm/remove',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
     //获取开工预付款总额
-    async getStartAmount(form, msg = true) {
+    async getStartAmount(form) {
         return HcApi({
             url: '/api/blade-meter/startPayMeterForm/getStartAmount',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
 
-}
+}

+ 6 - 6
src/api/modules/menu.js

@@ -1,21 +1,21 @@
 import { HcApi } from '../request/index'
 import website from '~src/config/index'
 
-export const getRoutes = (msg = true) => HcApi({
+export const getRoutes = () => HcApi({
     url: '/api/blade-system/menu/routes',
     method: 'get',
     params: {
         sysType: website.clientId,
     },
-}, msg)
+})
 
-export const getButtons = (msg = true) => HcApi({
+export const getButtons = () => HcApi({
     url: '/api/blade-system/menu/buttons',
     method: 'get',
-}, msg)
+})
 
-export const getAazyList = (form, msg = true) => HcApi({
+export const getAazyList = (form) => HcApi({
     url: '/api/blade-system/menu/lazy-list',
     method: 'get',
     params: form,
-}, msg)
+})

+ 18 - 18
src/api/modules/other.js

@@ -1,37 +1,37 @@
 import { HcApi } from '../request/index'
 
 //用户配置保存
-export const userConfigSave = (form, msg = true) => HcApi({
+export const userConfigSave = (form) => HcApi({
     url: '/api/blade-business/defaultConfig/saveOrUpdate',
     method: 'post',
     data: form,
-}, msg)
+})
 
 //用户配置详情
-export const userConfigInfo = (form = {}, msg = true) => HcApi({
+export const userConfigInfo = (form = {}) => HcApi({
     url: '/api/blade-business/defaultConfig/detail',
     method: 'get',
     params: form,
-}, msg)
+})
 
 //获取类型
-export const getDictionary = (form, msg = true) => HcApi({
+export const getDictionary = (form) => HcApi({
     url: '/api/blade-system/dict/dictionary',
     method: 'get',
     params: form,
-}, msg)
+})
 //业务字典
-export const getDictionaryBiz = (form, msg = true) => HcApi({
+export const getDictionaryBiz = (form) => HcApi({
     url: '/api/blade-system/dict-biz/dictionary',
     method: 'get',
     params: form,
-}, msg)
+})
 //获取用户列表
-export const getContractUserList = (form, msg = true) => HcApi({
+export const getContractUserList = (form) => HcApi({
     url: '/api/blade-manager/contractInfo/get-contract-userList',
     method: 'get',
     params: form,
-}, msg)
+})
 
 //获取租户详情
 export const getTenantDetail = (id) => HcApi({
@@ -49,30 +49,30 @@ export const getVersionJson = () => HcApi({
 }, false)
 
 //获取项目下的合同段信息
-export const getContractInfo = (form, msg = true) => HcApi({
+export const getContractInfo = (form) => HcApi({
     url: '/api/blade-manager/contractInfo/get-contractInfo',
     method: 'get',
     params: form,
-}, msg)
+})
 
 
 //获取质检划分树
-export const queryWbsTreeData = (form, msg = true) => HcApi({
+export const queryWbsTreeData = (form) => HcApi({
     url: '/api/blade-user/wbs/lazyQueryContractWbsTree',
     method: 'get',
     params: form,
-}, msg)
+})
 
 //短信验证
-export const sendNotice = (form, msg = true) => HcApi({
+export const sendNotice = (form) => HcApi({
     url: '/api/blade-business/task/send-notice',
     method: 'post',
     params: form,
-}, msg)
+})
 
 //短信过期时间
-export const saveSmsTimeout = (form, msg = true) => HcApi({
+export const saveSmsTimeout = (form) => HcApi({
     url: '/api/blade-business/task/save-sms-timeout',
     method: 'get',
     params: form,
-}, msg)
+})

+ 24 - 24
src/api/modules/project/debit/contract/check-list.js

@@ -3,74 +3,74 @@ import { HcApi } from '../../../../request/index'
 // 合同工程清单
 
 //获取获取合同工程清单表
-// export const getFormTree = (form = {}, msg = true) => HcApi({
+// export const getFormTree = (form = {}) => HcApi({
 //     url: '/api/blade-meter/contractInventoryForm/getFormTree',
 //     method: 'get',
 //     params: form,
-// }, msg)
-export const getContrInFormAllByConId = (form = {}, msg = true) => HcApi({
+// })
+export const getContrInFormAllByConId = (form = {}) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/getContrInFormAllByConId',
     method: 'get',
     params: form,
-}, msg)
-export const getLazyFormTree = (form = {}, msg = true) => HcApi({
+})
+export const getLazyFormTree = (form = {}) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/lazyTree',
     method: 'get',
     params: form,
-}, msg)
+})
 //获取节点详情
-export const getDetail = (form = {}, msg = true) => HcApi({
+export const getDetail = (form = {}) => HcApi({
     url: '/api//blade-meter/contractInventoryForm/detail',
     method: 'get',
     params: form,
-}, msg)
+})
 
 //导入清单
-export const importExcel = (form, msg = true) => HcApi({
+export const importExcel = (form) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/importExcel',
     method: 'post',
     data: form,
-}, msg)
+})
 //新增节点
-export const addNode = (form, msg = true) => HcApi({
+export const addNode = (form) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/add',
     method: 'post',
     data: form,
-}, msg)
+}, false)
 //修改节点
-export const updateForm = (form, msg = true) => HcApi({
+export const updateForm = (form) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/updateForm',
     method: 'post',
     data: form,
-}, msg)
+}, false)
 //排序节点
-export const sortForm = (form, msg = true) => HcApi({
+export const sortForm = (form) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/sort',
     method: 'post',
     params: form,
-}, msg)
+}, false)
 //删除节点
-export const deleteNode = (form = {}, msg = true) => HcApi({
+export const deleteNode = (form = {}) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/delete',
     method: 'get',
     params: form,
-}, msg)
+}, false)
 //获取导入模板
-export const getImportTemplate = (form = {}, msg = true) => HcApi({
+export const getImportTemplate = (form = {}) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/getImportTemplate',
     method: 'get',
     params: form,
-}, msg)
+})
 //锁定节点
-export const lockNode = (form = {}, msg = true) => HcApi({
+export const lockNode = (form = {}) => HcApi({
     url: '/api/blade-meter/contractInventoryForm/lockNode',
     method: 'get',
     params: form,
-}, msg)
+}, false)
 
 //添加同合计量 清单
-export const saveInvenFormMeter = (form, msg = true) => HcApi({
+export const saveInvenFormMeter = (form) => HcApi({
     url: '/api/blade-meter/inventoryFormMeter/saveInvenFormMeter',
     method: 'post',
     params: form,
-}, msg)
+})

+ 27 - 27
src/api/modules/project/debit/contract/pay.js

@@ -3,84 +3,84 @@ import { HcApi } from '../../../../request/index'
 //  合同支付项
 export default {
     //系统中期支付项列表(ype=0(未被引用),type=1(已引用),type=空(全部))
-   async getSyslist(form, msg = true) {
+   async getSyslist(form) {
     return HcApi({
         url: '/api/blade-meter/mid/pay/item/system/list',
             method: 'post',
             params: form,
-        }, msg)
+        })
    },
     //合同段中期支付项引用项目级数据
-    async referenced(form, msg = true) {
+    async referenced(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/contract/referenced',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
      },
          //合同段中期支付项分页
-    async getProListPage(form, msg = true) {
+    async getProListPage(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/contract/page',
             method: 'post',
             data: form,
-        }, msg)
+        })
      },
      //合同段中期支付项详情
-    async getProDetail(form, msg = true) {
+    async getProDetail(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/contract/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //合同段中期支付项修改
-    async updateProList(form, msg = true) {
+    async updateProList(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/contract/update',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
      },
      //合同段中期支付项删除
-    async removeProList(form, msg = true) {
+    async removeProList(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/contract/remove',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //合同段中期支付项列表(全部)
-    async getProPayList(form, msg = true) {
+    async getProPayList(form) {
         return HcApi({
                 url: '/api/blade-meter/mid/pay/item/contract/all-list',
                 method: 'post',
                 params: form,
-            }, msg)
+            })
     },
      //中期支付项添加汇总项
-     async addCollect(form, msg = true) {
+     async addCollect(form) {
         return HcApi({
                 url: '/api/blade-meter/mid/pay/item/bind/submit',
                 method: 'post',
                 params: form,
-            }, msg)
+            }, false)
     },
     //中期支付项删除汇总项
-    async removeCollect(form, msg = true) {
+    async removeCollect(form) {
         return HcApi({
                 url: '/api/blade-meter/mid/pay/item/bind/remove',
                 method: 'post',
                 params: form,
-            }, msg)
+            }, false)
     },
     //合同段中期支付项排序
-    async getSort(form, msg = true) {
-    return HcApi({
-        url: '/api/blade-meter/mid/pay/item/contract/sort',
-        method: 'post',
-        params: form,
-    }, msg)
-},
-        
-}
+    async getSort(form) {
+        return HcApi({
+            url: '/api/blade-meter/mid/pay/item/contract/sort',
+            method: 'post',
+            params: form,
+        }, false)
+    },
+
+}

+ 39 - 39
src/api/modules/project/debit/contract/unit.js

@@ -3,154 +3,154 @@ import { HcApi } from '../../../../request/index'
 //  合同计量单元
 export default {
     //懒加载系统树
-    async lazyTree(form, msg = true) {
+    async lazyTree(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/lazy',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //合同段树初始化(新增、增量同步)
-    async refresh(form, msg = true) {
+    async refresh(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/refresh',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
       //获取节点详情
-      async getNodeDetail(form, msg = true) {
+      async getNodeDetail(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //修改节点
-   async updateForm(form, msg = true) {
+   async updateForm(form) {
     return HcApi({
         url: '/api/blade-meter/tree/contract/update',
         method: 'post',
         data: form,
-    }, msg)
+    }, false)
    },
     //新增节点
-    async addNode(form, msg = true) {
+    async addNode(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/save',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除节点
-       async deleteNode(form, msg = true) {
+       async deleteNode(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/remove',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
     //调整排序
-    async sortForm(form, msg = true) {
+    async sortForm(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/sort',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
       //合同段树节点锁定-解锁
-      async getLock(form, msg = true) {
+      async getLock(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/lock',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //合同段-新增-增补单元-左边节点列表
-    async getLeftList(form, msg = true) {
+    async getLeftList(form) {
     return HcApi({
             url: '/api/blade-meter/tree/contract/left-list',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //系统、项目、合同段获取节点类型列表接口:
-    async getNodeTypeList(form, msg = true) {
+    async getNodeTypeList(form) {
         return HcApi({
             url: '/api/blade-meter/tree/getNodeTypeList',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
        //合同段修改时获取下级节点类型列表接口:
-    async getNodeTypeListUpdate(form, msg = true) {
+    async getNodeTypeListUpdate(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/update/getNodeTypeList',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
-    async removeInfo(form, msg = true) {
+    async removeInfo(form) {
         return HcApi({
             url: '/api/blade-meter/inventoryFormMeter/removeInfo',
             method: 'post',
             params: form,
-        }, msg)
+        })
     },
     //获取当前节点下,当期未被计量的所有清单
-    async getCurrentNodeAllForm(form, msg = true) {
+    async getCurrentNodeAllForm(form) {
         return HcApi({
             url: '/api/blade-meter/middleMeterApply/getWbsNodeInfo',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //获取计量和WBS全加载树
-    async getMeterTreeAndWbsTree(form, msg = true) {
+    async getMeterTreeAndWbsTree(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/meterTreeAndWbsTree',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //获取当前节点下,当期未被计量的所有清单
-    async LinkMeterTreeAndWbsTree(form, msg = true) {
+    async LinkMeterTreeAndWbsTree(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/LinkMeterTreeAndWbsTree',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除合同计量单元关联WBS节点
-    async deleteLinkWbsTree(form, msg = true) {
+    async deleteLinkWbsTree(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/deleteLinkWbsTree',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //获取合同计量单元导入模板
-    async importTemplate(form, msg = true) {
+    async importTemplate(form) {
         return HcApi({
                 url: '/api/blade-meter/tree/contract/importTemplate',
                 method: 'get',
                 params: form,
-            }, msg)
+            }, false)
     },
     //复制节点,获取子树
-    async getCurrentNodeTree(form, msg = true) {
+    async getCurrentNodeTree(form) {
         return HcApi({
                 url: '/api/blade-meter/tree/contract/getCurrentNodeTree',
                 method: 'get',
                 params: form,
-            }, msg)
+            })
     },
     //删除合同计量单元关联WBS节点
-    async copyNode(form, msg = true) {
+    async copyNode(form) {
         return HcApi({
             url: '/api/blade-meter/tree/contract/copyNode',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
-}
+}

+ 18 - 18
src/api/modules/project/debit/project/pay.js

@@ -2,76 +2,76 @@ import { HcApi } from '../../../../request/index'
 
 //  项目支付项
 export default {
-   async getSyslist(form, msg = true) {
+   async getSyslist(form) {
     return HcApi({
         url: '/api/blade-meter/mid/pay/item/system/list',
             method: 'post',
             params: form,
-        }, msg)
+        })
    },
     //项目中期支付项引用系统级数据
-    async referenced(form, msg = true) {
+    async referenced(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/project/referenced',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
      },
          //项目中期支付项分页
-    async getProListPage(form, msg = true) {
+    async getProListPage(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/project/page',
             method: 'post',
             data: form,
-        }, msg)
+        })
      },
      //项目中期支付项详情
-    async getProDetail(form, msg = true) {
+    async getProDetail(form) {
         return HcApi({
             url: '/api//blade-meter/mid/pay/item/project/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //项目中期支付项修改
-    async updateProList(form, msg = true) {
+    async updateProList(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/project/update',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
      },
      //项目中期支付项删除
-    async removeProList(form, msg = true) {
+    async removeProList(form) {
         return HcApi({
             url: '/api/blade-meter/mid/pay/item/project/remove',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //项目中期支付项列表
-    async getProPayList(form, msg = true) {
+    async getProPayList(form) {
         return HcApi({
                 url: '/api/blade-meter/mid/pay/item/project/list',
                 method: 'post',
                 params: form,
-            }, msg)
+            })
     },
      //中期支付项添加汇总项
-     async addCollect(form, msg = true) {
+     async addCollect(form) {
         return HcApi({
                 url: '/api/blade-meter/mid/pay/item/bind/submit',
                 method: 'post',
                 params: form,
-            }, msg)
+            }, false)
     },
     //中期支付项删除汇总项
-    async removeCollect(form, msg = true) {
+    async removeCollect(form) {
         return HcApi({
                 url: '/api/blade-meter/mid/pay/item/bind/remove',
                 method: 'post',
                 params: form,
-            }, msg)
+            }, false)
     },
 
 }

+ 19 - 19
src/api/modules/project/debit/project/unit.js

@@ -3,76 +3,76 @@ import { HcApi } from '../../../../request/index'
 //  项目计量单元
 export default {
     //懒加载系统树
-    async lazyTree(form, msg = true) {
+    async lazyTree(form) {
         return HcApi({
             url: '/api/blade-meter/tree/project/lazy',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //获取默认项目
-    async refresh(form, msg = true) {
+    async refresh(form) {
         return HcApi({
             url: '/api/blade-meter/tree/project/refresh',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
       //获取节点详情
-      async getNodeDetail(form, msg = true) {
+      async getNodeDetail(form) {
         return HcApi({
             url: '/api/blade-meter/tree/project/detail',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //修改节点
-   async updateForm(form, msg = true) {
+   async updateForm(form) {
     return HcApi({
         url: '/api/blade-meter/tree/project/update',
         method: 'post',
         data: form,
-    }, msg)
+    }, false)
    },
     //新增节点
-    async addNode(form, msg = true) {
+    async addNode(form) {
         return HcApi({
             url: '/api/blade-meter/tree/project/save',
             method: 'post',
             data: form,
-        }, msg)
+        }, false)
     },
     //删除节点
-       async deleteNode(form, msg = true) {
+       async deleteNode(form) {
         return HcApi({
             url: '/api/blade-meter/tree/project/remove',
             method: 'get',
             params: form,
-        }, msg)
+        }, false)
     },
     //调整排序
-    async sortForm(form, msg = true) {
+    async sortForm(form) {
         return HcApi({
             url: '/api/blade-meter/tree/project/sort',
             method: 'post',
             params: form,
-        }, msg)
+        }, false)
     },
 
     //项目树节点项目树节点新增获取工程类型名称
-    async getEngineeringTypeName(form, msg = true) {
+    async getEngineeringTypeName(form) {
         return HcApi({
             url: '/api/blade-meter/tree/project/getEngineeringTypeName',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //系统、项目、合同段获取节点类型列表接口:
-    async getNodeTypeList(form, msg = true) {
+    async getNodeTypeList(form) {
         return HcApi({
             url: '/api/blade-meter/tree/getNodeTypeList',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
-}
+}

+ 26 - 26
src/api/modules/tasks/flow.js

@@ -2,92 +2,92 @@ import { HcApi } from '../../request/index'
 
 export default {
     //分页数据
-    async getPageData(form, msg = true) {
+    async getPageData(form) {
         return HcApi({
             url: '/api/blade-meter/task/getFixedFlowPage',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //获取系统所有角色划分
-    async queryAllRoleList(form, msg = true) {
+    async queryAllRoleList(form) {
         return HcApi({
             url: '/api/blade-business/fixedFlow/queryAllRoleList',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //详情
-    async queryFixedFlowDetail(form, msg = true) {
+    async queryFixedFlowDetail(form) {
         return HcApi({
             url: '/api/blade-meter/task/getFixedFlow',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //新增
-    async saveFixedFlow(form, msg = true) {
+    async saveFixedFlow(form) {
         return HcApi({
             url: '/api/blade-meter/task/saveFixedFlow',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //修改
-    async updateFixedFlowData(form, msg = true) {
+    async updateFixedFlowData(form) {
         return HcApi({
             url: '/api/blade-meter/task/updateFixedFlow',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //删除
-    async removeFixedFlowData(form, msg = true) {
+    async removeFixedFlowData(form) {
         return HcApi({
             url: '/api/blade-meter/task/deleteFixedFlow',
             method: 'post',
             params: form,
-        }, msg)
+        })
     },
     //计量刪除预设流程分支
-    async deleteFixedFlowBranch(form, msg = true) {
+    async deleteFixedFlowBranch(form) {
         return HcApi({
             url: '/api/blade-meter/task/deleteFixedFlowBranch',
             method: 'post',
             params: form,
-        }, msg)
+        })
     },
     //检查任务人是否存在签字证书信息
-    async checkTaskUserCertificateInfo(form, msg = true) {
+    async checkTaskUserCertificateInfo(form) {
         return HcApi({
             url: '/api/blade-archive/archiveTask/checkTaskUserCertificateInfo',
             method: 'post',
             params: form,
-        }, msg)
+        })
     },
     //批量上报
-    async batchReportTaskArchive(form, msg = true) {
+    async batchReportTaskArchive(form) {
         return HcApi({
             url: '/api/blade-business/task/batch-report-task-archive',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //批量认证
-    async batchCertification(form, msg = true) {
+    async batchCertification(form) {
         return HcApi({
             url: '/api/blade-archive/archiveTask/batchCertification',
             method: 'post',
             params: form,
-        }, msg)
+        })
     },
     //批量撤销 //数据类型,=1表示档案文件收集处的废除;=2时表示任务审批处的废除
-    async batchRepealTaskArchive(form, msg = true) {
+    async batchRepealTaskArchive(form) {
         return HcApi({
             url: '/api/blade-business/task/batch-repeal-task-archive',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
 
     //获取任务名称
@@ -96,7 +96,7 @@ export default {
             url: '/api/blade-meter/task/name',
             method: 'get',
             params: form,
-        }, false)
+        })
     },
     //任务上报
     async reportTaskForm(form) {
@@ -107,12 +107,12 @@ export default {
         }, false)
     },
     //获取预设流程信息
-    async getFixedFlow(form, msg = true) {
+    async getFixedFlow(form) {
         return HcApi({
             url: '/api/blade-meter/task/getFixedFlow',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //排序
     async batchUpdateSort(form) {
@@ -122,6 +122,6 @@ export default {
             data: {
                 list: form,
             },
-        }, false)
+        })
     },
 }

+ 9 - 9
src/api/modules/tasks/hc-data.js

@@ -7,7 +7,7 @@ export default {
             url: '/api/blade-system/dict/dictionary?code=meter_task_type',
             method: 'get',
             params: {},
-        }, false)
+        })
     },
     //获取任务状态
     async queryTaskStatus(form) {
@@ -15,7 +15,7 @@ export default {
             url: '/api/blade-business/task/query-task-type-status',
             method: 'get',
             params: form,
-        }, false)
+        })
     },
     //获取当前合同段的上报批次
     async queryBatchList(form) {
@@ -23,7 +23,7 @@ export default {
             url: '/api/blade-business/task/query-batch-list',
             method: 'get',
             params: form,
-        }, false)
+        })
     },
     //获取任务列表分页
     async getPage(form) {
@@ -31,7 +31,7 @@ export default {
             url: '/api/blade-meter/task/page',
             method: 'post',
             data: form,
-        }, false)
+        })
     },
     //获取任务详情
     async getDetail(id) {
@@ -39,7 +39,7 @@ export default {
             url: '/api/blade-meter/task/detail',
             method: 'get',
             params: { id },
-        }, false)
+        })
     },
     //获取任务数据信息详情
     async getDataDetail(form) {
@@ -47,7 +47,7 @@ export default {
             url: '/api/blade-meter/task/data/detail',
             method: 'get',
             params: form,
-        }, false)
+        })
     },
     //任务关联的数据删除(清单、变更令删除)
     async tableRemove(form) {
@@ -71,7 +71,7 @@ export default {
             url: '/api/blade-meter/task/data/inventoryFormApplyTask/save',
             method: 'post',
             data: form,
-        }, false)
+        })
     },
     //附件文件上传
     async taskUploadFile(form) {
@@ -95,7 +95,7 @@ export default {
             url: '/api/blade-meter/task/comment/list',
             method: 'get',
             params: form,
-        }, false)
+        })
     },
     //批注信息新增或修改
     async taskCommentSubmit(form) {
@@ -184,6 +184,6 @@ export default {
             url: '/api/blade-business/task/check-sms-code',
             method: 'post',
             data: form,
-        }, false)
+        })
     },
 }

+ 10 - 10
src/api/modules/userInfo/index.js

@@ -2,43 +2,43 @@ import { HcApi } from '../../request/index'
 
 export default {
     //修改密码
-    async updatePassword(form, msg = true) {
+    async updatePassword(form) {
         return HcApi({
             url: '/api/blade-user/update-password',
             method: 'post',
             params: form,
-        }, msg)
+        })
     },
     //设置默认项目
-    async setDefaultProject(form, msg = true) {
+    async setDefaultProject(form) {
         return HcApi({
             url: '/api/blade-business/defaultProject/save',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //获取默认项目
-    async getDefaultProject(form, msg = true) {
+    async getDefaultProject(form) {
         return HcApi({
             url: '/api/blade-business/defaultProject/queryUserDefault',
             method: 'get',
             params: form,
-        }, msg)
+        })
     },
     //更新用户信息
-    async updateUserInfo(form, msg = true) {
+    async updateUserInfo(form) {
         return HcApi({
             url: '/api/blade-user/update-info',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
     //获取用户信息
-    async queryCurrentUserData(form = {}, msg = true) {
+    async queryCurrentUserData(form = {}) {
         return HcApi({
             url: '/api/blade-business/userViewProjectContract/queryCurrentUserData',
             method: 'post',
             data: form,
-        }, msg)
+        })
     },
 }

+ 5 - 4
src/api/request/index.js

@@ -8,7 +8,7 @@ import website from '~src/config'
 const store = useAppStore(pinia)
 
 //封装的请求
-export const HcApi = async (obj, msg) => {
+export const HcApi = async (obj, msg = true) => {
     return new Promise((resolve) => {
         //处理统一的请求头
         obj.headers = obj.headers ?? {}
@@ -16,19 +16,20 @@ export const HcApi = async (obj, msg) => {
         obj.headers['Tenant-Id'] = obj.headers['Tenant-Id'] ?? store.tenantId
         //发起请求
         httpApi(obj).then((response) => {
-            //console.log(response)
             resolve(response)
         }).catch((response) => {
-            getResData(response)
+            getResData(response, msg)
             resolve(response)
         })
     })
 }
 
 //处理数据
-const getResData = ({ code }) => {
+const getResData = ({ code, msg }, isMsg) => {
     if (code === 401) {
         window.$message?.error('身份失效,请重新登录!')
         router.push({ path: '/login-main' }).then()
+    } else if (isMsg) {
+        window.$message?.error(msg || '操作失败')
     }
 }