diff --git a/api/contract.js b/api/contract.js index 6248e44..da2bcae 100644 --- a/api/contract.js +++ b/api/contract.js @@ -2,36 +2,75 @@ import api from './api' export function getContractPage(data) { - return api.get('/crm/contract/page', data, { login: false }) + return api.get('/crm/contract/page', data, { + login: false + }) } export function getContractNo(data) { - return api.get('/crm/contract/getCode', data, { login: false }) + return api.get('/crm/contract/getCode', data, { + login: false + }) } - export function createContract(data) { - return api.post('/crm/contract/create', data, { login: false }) + return api.post('/crm/contract/create', data, { + login: false + }) } - export function getContract(data) { - return api.get('/crm/contract/get', data, { login: false }) + return api.get('/crm/contract/get', data, { + login: false + }) } - export function getContractProductListByContractId(data) { - return api.get('/crm/contract/contract-product/list-by-contract-id', data, { login: false }) + return api.get('/crm/contract/contract-product/list-by-contract-id', data, { + login: false + }) } - export function updateContract(data) { - return api.put('/crm/contract/update', data, { login: false }) + return api.put('/crm/contract/update', data, { + login: false + }) } - export function check(data) { - return api.post('/crm/contract/check', data, { login: false }) + return api.post('/crm/contract/check', data, { + login: false + }) } +//改成OA之后的 +export function getOAContractPage(data) { + return api.get('/bpm/oa/contract/page', data, { + login: false + }) +} +//创建 +export function createOAContract(data) { + return api.post('/bpm/oa/contract/create', data, { + login: false + }) +} +//详情 +export function getOAContract(data) { + return api.get('/bpm/oa/contract/get', data, { + login: false + }) +} +//详情 +export function getByProcessInstanceId(data) { + return api.get('/bpm/oa/contract/getByProcessInstanceId', data, { + login: false + }) +} +//获得同部门的合同审批 +export function getListByDeptId(data) { + return api.get('/bpm/oa/contract/getListByDeptId', data, { + login: false + }) +} \ No newline at end of file diff --git a/config/index.js b/config/index.js index da2a9bc..498bc72 100644 --- a/config/index.js +++ b/config/index.js @@ -1,4 +1,4 @@ -export const VUE_APP_API_URL = 'http://192.168.0.179:48080/admin-api' +export const VUE_APP_API_URL = 'http://192.168.0.107:48080/admin-api' export const VUE_APP_UPLOAD_URL = VUE_APP_API_URL + '/infra/file/upload' export const VUE_APP_UPLOAD_URL2 = VUE_APP_API_URL + '/system/user/profile/update-avatar' export const APP_ID = 'wx91fcb30adb2df321' diff --git a/pages/components/pages/contract/add.vue b/pages/components/pages/contract/add.vue index fdec133..23cc07c 100644 --- a/pages/components/pages/contract/add.vue +++ b/pages/components/pages/contract/add.vue @@ -1,77 +1,72 @@ + + .storeName { + font-size: 30rpx; + } + \ No newline at end of file diff --git a/pages/components/pages/contract/index.vue b/pages/components/pages/contract/index.vue index b7b19b0..beb1952 100644 --- a/pages/components/pages/contract/index.vue +++ b/pages/components/pages/contract/index.vue @@ -1,337 +1,351 @@ - - - - - + + const handleSelect = (key) => { + relation.value = key.value + getList() + } + + // 审核 + const onCheck = (id, type) => { + if (type == 'look') { + uni.navigateTo({ + url: '/pages/components/pages/contract/add?id=' + id + '&type=edit' + }); + } else { + uni.navigateTo({ + url: '/pages/components/pages/contract/add?id=' + id + '&type=check' + }); + } + } + + const getList = async (isNextPage, pages) => { + await getOAContractPage({ + pageNo: page.value, + pageSize: pageSize.value, + isMyContract: relation.value, + contractName: keyword.value, + }).then(res => { + if (res) { + if (res.list.length < 10) { + listStatus.value = 'nomore' + } + + if (res.list.length == 0) { + lastPage.value = true + } + + if (isNextPage) { + dataList.value = dataList.value.concat(res.list) + return + } + dataList.value = res.list + } + }) + } + + const scroll = (e) => { + oldScrollTop.value = e.detail.scrollTop + } + + const reachBottom = () => { + if (lastPage.value || listStatus.value == 'loading') return; + listStatus.value = 'loading' + setTimeout(() => { + if (lastPage.value) return; + getList(true, ++page.value) + if (dataList.value.length >= 10) listStatus.value = 'loadmore'; + else listStatus.value = 'loading'; + }, 1200) + } + // 点击搜索 + const onSearch = () => { + page.value = 1 + lastPage.value = false + getList() + } + + const onItem = (val) => { + uni.navigateTo({ + url: '/pages/components/pages/contract/add?id=' + val + '&type=edit' + }); + } + + // 添加 + const onAdd = () => { + uni.navigateTo({ + url: '/pages/components/pages/contract/add' + }) + } + + + \ No newline at end of file diff --git a/pages/components/pages/customer/customerDetails.vue b/pages/components/pages/customer/customerDetails.vue index b5474a0..75417fb 100644 --- a/pages/components/pages/customer/customerDetails.vue +++ b/pages/components/pages/customer/customerDetails.vue @@ -25,7 +25,9 @@ - + + + 手机：{{customer.mobile}}