diff --git a/src/api/base/agreement.js b/src/api/base/agreement.js
index 1f95bfd..133bcb9 100644
--- a/src/api/base/agreement.js
+++ b/src/api/base/agreement.js
@@ -5,7 +5,7 @@ import request from '@/utils/request'
/** 新增协议 */
export const addProtocolApi = (data) => {
- return request.post('/xxx/xx', data)
+ return request.post('/base/agreement/add', data)
}
/** 删除协议 */
export const deleteProtocolApi = (id) => {
@@ -13,9 +13,11 @@ export const deleteProtocolApi = (id) => {
}
/** 修改协议 */
export const editProtocolApi = (data) => {
- return request.post('/xxx/xx', data)
+ return request.put('/base/agreement/update', data)
}
/** 协议列表查询 */
export const queryProtocolListApi = (data) => {
- return request.post('/xxx/xx', data)
-}
\ No newline at end of file
+ return request.get('/base/agreement/getAgreementList', {
+ params: data
+ })
+}
diff --git a/src/api/base/customer.js b/src/api/base/customer.js
index c21654b..08878ab 100644
--- a/src/api/base/customer.js
+++ b/src/api/base/customer.js
@@ -5,7 +5,7 @@ import request from '@/utils/request'
/** 新增往来单位 */
export const addContactUnitsApi = (data) => {
- return request.post('/xxx/xx', data)
+ return request.post('/base/customer/add', data)
}
/** 删除往来单位 */
export const deleteContactUnitsApi = (id) => {
@@ -13,9 +13,11 @@ export const deleteContactUnitsApi = (id) => {
}
/** 修改往来单位 */
export const editContactUnitsApi = (data) => {
- return request.post('/xxx/xx', data)
+ return request.put('/base/customer/update', data)
}
/** 往来单位列表查询 */
export const queryContactUnitsListApi = (data) => {
- return request.post('/xxx/xx', data)
-}
\ No newline at end of file
+ return request.get('/base/customer/getList', {
+ params: data
+ })
+}
diff --git a/src/api/base/project.js b/src/api/base/project.js
index 6908678..eefbcaf 100644
--- a/src/api/base/project.js
+++ b/src/api/base/project.js
@@ -9,13 +9,15 @@ export const addProjectApi = (data) => {
}
/** 删除工程 */
export const deleteProjectApi = (id) => {
- return request.delete('/base/project/deleteProById', id)
+ return request.delete(`/base/project?${id}`, )
}
/** 修改工程 */
export const editProjectApi = (data) => {
- return request.post('/xxx/xx', data)
+ return request.put('/base/project/update', data)
}
/** 工程列表查询 */
export const queryProjectListApi = (data) => {
- return request.post('/xxx/xx', data)
-}
\ No newline at end of file
+ return request.get('/base/project/getProjectList', {
+ params: data
+ })
+}
diff --git a/src/api/base/unitType.js b/src/api/base/unitType.js
index d4cdd93..71477cd 100644
--- a/src/api/base/unitType.js
+++ b/src/api/base/unitType.js
@@ -5,7 +5,7 @@ import request from '@/utils/request'
/** 新增单位类型*/
export const addUnitTypeApi = (data) => {
- return request.post('/xxx/xx', data)
+ return request.post('/base/unittype/add', data)
}
/** 删除单位类型*/
export const deleteUnitTypeApi = (id) => {
@@ -13,11 +13,11 @@ export const deleteUnitTypeApi = (id) => {
}
/** 修改单位类型*/
export const editUnitTypeApi = (data) => {
- return request.post('/base/unittype/update', data)
+ return request.put('/base/unittype/update', data)
}
/** 单位类型列表查询 */
export const queryUnitTypeListApi = (data) => {
return request.get('/base/unittype/getUnitTypeList', {
- params: {}
+ params: data
})
-}
\ No newline at end of file
+}
diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue
index 480b582..79e595a 100644
--- a/src/components/TableModel/index.vue
+++ b/src/components/TableModel/index.vue
@@ -200,14 +200,10 @@ export default {
// 列表接口查询参数
queryParams: {
pageNum: 1,
- pageSize: 20,
+ pageSize: 10,
},
// 列表数据源
- tableList: [
- { scrapNum: '测试' },
- { scrapNum: '123' },
- { scrapNum: '测试' },
- ],
+ tableList: [],
// 列表数据条数
total: 0,
// 搜索区域是否隐藏
@@ -245,6 +241,7 @@ export default {
async getTableList() {
const res = await this.requestApi(this.queryParams)
console.log(res, '列表数据')
+ if(res.code === 200) this.tableList = res.rows
},
/** 查询按钮 */
handleQuery() {
diff --git a/src/permission.js b/src/permission.js
index 5297df9..3c72618 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -11,7 +11,8 @@ NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/register']
router.beforeEach((to, from, next) => {
- NProgress.start()
+ // next()
+ NProgress.start()
if (getToken()) {
console.log(getToken())
to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
diff --git a/src/router/index.js b/src/router/index.js
index 87e0365..0061b8a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -72,30 +72,30 @@ export const constantRoutes = [
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
},
- // {
- // path: 'ProjectManage',
- // component: () => import('@/views/base/project'),
- // name: 'ProjectManage',
- // meta: { title: '工程管理', icon: 'dashboard', affix: true }
- // },
- // {
- // path: 'ContactUnits',
- // component: () => import('@/views/base/contun'),
- // name: 'ContactUnits',
- // meta: { title: '往来单位', icon: 'dashboard', affix: true }
- // },
- // {
- // path: 'UnitType',
- // component: () => import('@/views/base/unitType'),
- // name: 'UnitType',
- // meta: { title: '单位类型', icon: 'dashboard', affix: true }
- // },
- // {
- // path: 'ProtocolManage',
- // component: () => import('@/views/base/agreement'),
- // name: 'ProtocolManage',
- // meta: { title: '协议管理', icon: 'dashboard', affix: true }
- // }
+ {
+ path: 'ProjectManage',
+ component: () => import('@/views/base/project'),
+ name: 'ProjectManage',
+ meta: { title: '工程管理', icon: 'dashboard', affix: true }
+ },
+ {
+ path: 'ContactUnits',
+ component: () => import('@/views/base/customer'),
+ name: 'ContactUnits',
+ meta: { title: '往来单位', icon: 'dashboard', affix: true }
+ },
+ {
+ path: 'UnitType',
+ component: () => import('@/views/base/unitType'),
+ name: 'UnitType',
+ meta: { title: '单位类型', icon: 'dashboard', affix: true }
+ },
+ {
+ path: 'ProtocolManage',
+ component: () => import('@/views/base/agreement'),
+ name: 'ProtocolManage',
+ meta: { title: '协议管理', icon: 'dashboard', affix: true }
+ }
]
},
{
diff --git a/src/views/base/agreement/components/form-protocol.vue b/src/views/base/agreement/components/form-protocol.vue
index ef5c55a..cc52da1 100644
--- a/src/views/base/agreement/components/form-protocol.vue
+++ b/src/views/base/agreement/components/form-protocol.vue
@@ -10,69 +10,67 @@
>
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
确认
@@ -90,6 +88,11 @@