diff --git a/api/AccountPriceFinallReview.js b/api/AccountPriceFinallReview.js
new file mode 100644
index 0000000..cfaf8be
--- /dev/null
+++ b/api/AccountPriceFinallReview.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询账期价格复审主列表
+export const getPriceFinallReviewList = (data, query) => {
+ return request({
+ method: 'post',
+ url: '/bussiness/baseusercredithistory/credit-period-repeatedly-review-list',
+ data,
+ params: query,
+ })
+}
diff --git a/api/AccountPricePreliminaryRreview.js b/api/AccountPricePreliminaryRreview.js
new file mode 100644
index 0000000..827530b
--- /dev/null
+++ b/api/AccountPricePreliminaryRreview.js
@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+// 获取账期价格初审列表
+export const getPricePreliminaryReviewList = (data, query) => {
+ return request({
+ method: 'post',
+ url: '/bussiness/baseusercredithistory/credit-period-initial-review-list',
+ data,
+ params: query
+ })
+}
+
+// 根据 ID 获取账期价格初审详情
+export const getPricePreliminaryReviewDetail = (query) => {
+ return request({
+ method: 'get',
+ url: '/bussiness/baseusercredithistory/get-creditline-creditperiod',
+ params: query
+ })
+}
+
+// 获取账期审核/额度审核列表(两个列表一个接口)
+export const getLastPaymentAndQuotaList = (data, query) => {
+ return request({
+ method: 'post',
+ url: '/bussiness/baseusercredithistory/goods-credit-period-initial-review-list',
+ params: query,
+ data: data,
+ })
+}
+
+// 账期终审/额度终审的回退(两个列表一个接口)
+export const putBackDataLastPaymentOrQuota = (data) => {
+ return request({
+ method: 'put',
+ url: '/bussiness/baseusercredithistory/goods-credit-period-repeatedly-review-back',
+ data,
+ })
+}
+
+// 额度终审 (副总监初审)
+export const directorLastReviewQuota = (query) => {
+ return request({
+ method: 'put',
+ url: '/bussiness/baseusercredithistory/goods-credit-limit-repeatedly-review',
+ params: query,
+ })
+}
+
+// 价格审核列表
+export const getPriceChangeReviewList = (data, query) => {
+ return request({
+ method: 'post',
+ url: '/bussiness/baseusercredithistory/goods-credit-line-initial-review-list',
+ params: query,
+ data
+ })
+}
+
+// 价格审核 的回退
+export const putBackDataPrice = (data) => {
+ return request({
+ method: 'put',
+ url: '/bussiness/businessgoods/goods-credit-line-initial-review-back',
+ data,
+ })
+}
+
+// 价格审核(副总监初审)
+export const directorReviewPrice = (query) => {
+ return request({
+ method: 'put',
+ url: 'bussiness/businessgoods/goods-credit-line-initial-review',
+ params: query,
+ })
+}
\ No newline at end of file
diff --git a/api/area.js b/api/area.js
new file mode 100644
index 0000000..4c6b110
--- /dev/null
+++ b/api/area.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获取地域列表
+export const getAreaList = () => {
+ return request({
+ method: 'get',
+ url: '/system/dept/regionals',
+ })
+}
\ No newline at end of file
diff --git a/api/order.js b/api/order.js
new file mode 100644
index 0000000..1e7d1cf
--- /dev/null
+++ b/api/order.js
@@ -0,0 +1,11 @@
+import request from "../utils/request";
+
+// 订单综合查询列表内部用户
+export const getReportOrderQuery = (data, query) => {
+ return request({
+ method: 'post',
+ url: '/report/stock/ReportOrderQuery',
+ data: data,
+ params: query,
+ })
+}
\ No newline at end of file
diff --git a/api/orderManager/index.js b/api/orderManager/index.js
index 9a98b51..de5229f 100644
--- a/api/orderManager/index.js
+++ b/api/orderManager/index.js
@@ -1,13 +1,13 @@
import request from '@/utils/request'
-export function listsalemain(data,query) {
+export function listsalemain(data, query) {
return request({
url: '/bussiness/salemain/list',
method: 'post',
data: data,
params: query,
-
+
})
}
@@ -21,24 +21,26 @@ export function productListWithUserId() {
}
// 查询s生产单位列表
-export function listproductList(data,query) {
- return request({
- url: '/system/dept/productList',
- method: 'get',
- data:data,
- params: query
- })
+export function listproductList(data, query) {
+ return request({
+ url: '/system/dept/productList',
+ method: 'get',
+ data: data,
+ params: query
+ })
}
+
// 新建销售订单时候的商品列表
-export function listsaleBusGoodsList(data,query) {
+export function listsaleBusGoodsList(data, query) {
return request({
url: '/bussiness/businessgoods/saleBusGoodsList',
method: 'post',
data: data,
params: query,
-
+
})
}
+
// 查询剩余额度
export function getsalemaincheckAmount(queryParams) {
return request({
@@ -47,6 +49,7 @@ export function getsalemaincheckAmount(queryParams) {
// isEncrypt: false
})
}
+
// 获取当前商业用户票扣列表
// 相当于补差
export function salemainpiAoKouList(data) {
@@ -57,6 +60,7 @@ export function salemainpiAoKouList(data) {
isEncrypt: false
})
}
+
// 新增
export function addsalemain(data) {
return request({
@@ -85,6 +89,7 @@ export function salemainDetail(salemainId) {
// isEncrypt: false
})
}
+
// 商务经理审批时获取详情,下面的商品列表
export function businessManagerReviewGoodsList(salemainId) {
return request({
@@ -98,14 +103,13 @@ export function businessManagerReviewGoodsList(salemainId) {
// 删除
export function delsalemain(id) {
return request({
- url: '/bussiness/salemain/remove?ids=' +id,
+ url: '/bussiness/salemain/remove?ids=' + id,
method: 'post',
// isEncrypt: false
})
}
-
// 订单详情中,查询商业用户详细--收货地址
export function BaseuserBusinessUserDetail(BaseuserBusinessUserId) {
return request({
@@ -125,11 +129,11 @@ export function getSaleDisDetail(saleid) {
}
// 销售订单操作日志
-export function salemainlogList(data,query) {
+export function salemainlogList(data, query) {
return request({
url: '/bussiness/salemainlog/list',
method: 'post',
- data:data,
+ data: data,
params: query,
isEncrypt: false
})
@@ -144,15 +148,11 @@ export function getInvoiceList(saleid) {
})
}
-
// 获取商业公司列表
-export function getBusinessList(data) {
+export const getBusinessCompanyList = (data) => {
return request({
- url: '/system/user/list_business',
method: 'post',
- data:data,
- isEncrypt: false
+ url: '/system/user/list_business',
+ data
})
}
-
-
diff --git a/components/Area.vue b/components/Area.vue
new file mode 100644
index 0000000..47d450c
--- /dev/null
+++ b/components/Area.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
diff --git a/components/BusinessCompany.vue b/components/BusinessCompany.vue
new file mode 100644
index 0000000..2d70671
--- /dev/null
+++ b/components/BusinessCompany.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
diff --git a/pages.json b/pages.json
index f7e67b2..7e8bf56 100644
--- a/pages.json
+++ b/pages.json
@@ -156,6 +156,27 @@
"props": true
// 开启 props 传参
}
+ },
+ {
+ "path": "pages/work/OrderSearchQuery/index",
+ "style": {
+ "navigationBarTitleText": "订单综合查询",
+ "props": true
+ }
+ },
+ {
+ "path": "pages/work/AccountPricePreliminaryRreview/index",
+ "style": {
+ "navigationBarTitleText": "账期价格初审",
+ "props": true
+ }
+ },
+ {
+ "path": "pages/work/AccountPriceFinallReview/index",
+ "style": {
+ "navigationBarTitleText": "账期价格复审",
+ "props": true
+ }
}
],
"tabBar": {
diff --git a/pages/login.vue b/pages/login.vue
index 3a3fbf9..55ed4ea 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,231 +1,197 @@
-
-
-
-
- 大冢APS Ultra管理平台
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 大冢APS Ultra管理平台
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 没有账号?
+ 立即注册
+
-
-
-
-
-
- 没有账号?
- 立即注册
-
+
-
-
\ No newline at end of file
+}
+
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 898c56c..6f36582 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -1,191 +1,192 @@
-
-
-
diff --git a/pages/mine/info/index.vue b/pages/mine/info/index.vue
index f1eddbd..1f5dd88 100644
--- a/pages/mine/info/index.vue
+++ b/pages/mine/info/index.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/pages/work/AccountPriceFinallReview/index.vue b/pages/work/AccountPriceFinallReview/index.vue
new file mode 100644
index 0000000..3328afc
--- /dev/null
+++ b/pages/work/AccountPriceFinallReview/index.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+ 公司名称
+ 地域
+ 账期终审
+ 额度终审
+ 价格终审
+
+
+ {{ index + 1 }}
+ {{ item.userName }}
+ {{ item.areaName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/AccountPricePreliminaryRreview/children/AccountPeriod.vue b/pages/work/AccountPricePreliminaryRreview/children/AccountPeriod.vue
new file mode 100644
index 0000000..2a0ffbf
--- /dev/null
+++ b/pages/work/AccountPricePreliminaryRreview/children/AccountPeriod.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+ 货主:
+ {{ row.companyName }}
+
+
+ 状态:
+ {{ row.state }}
+
+
+ 老账期:
+ {{ row.oldCreditPeriod }}
+
+
+ 新账期:
+ {{ row.creditPeriod }}
+
+
+ 申请日期:
+ {{ row.addDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/AccountPricePreliminaryRreview/children/CreditLimit.vue b/pages/work/AccountPricePreliminaryRreview/children/CreditLimit.vue
new file mode 100644
index 0000000..eb3c7e3
--- /dev/null
+++ b/pages/work/AccountPricePreliminaryRreview/children/CreditLimit.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+ 货主:
+ {{ row.companyName }}
+
+
+ 状态:
+ {{ row.state }}
+
+
+ 老额度(万元) :
+ {{ row.oldCreditLine }}
+
+
+ 新额度(万元):
+ {{ row.creditLine }}
+
+
+ 申请日期:
+ {{ row.addDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/AccountPricePreliminaryRreview/children/Price.vue b/pages/work/AccountPricePreliminaryRreview/children/Price.vue
new file mode 100644
index 0000000..9e39c75
--- /dev/null
+++ b/pages/work/AccountPricePreliminaryRreview/children/Price.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+ 发货仓库:
+ {{ row.warehouseName }}
+
+
+ 新考核价(元,含税):
+ {{ row.checkPrice }}
+
+
+ 新开票价(元,含税):
+ {{ row.invoicePrice }}
+
+
+ 原考核价(元,无税):
+ {{ row.oldCheckPrice }}
+
+
+ 原开票价(元,无税):
+ {{ row.oldInvoicePrice }}
+
+
+
+
+ 状态:
+ {{ row.state }}
+
+
+ 更新日期:
+ {{ row.updateTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/AccountPricePreliminaryRreview/children/components/AccountPeriodReview.vue b/pages/work/AccountPricePreliminaryRreview/children/components/AccountPeriodReview.vue
new file mode 100644
index 0000000..114068d
--- /dev/null
+++ b/pages/work/AccountPricePreliminaryRreview/children/components/AccountPeriodReview.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/AccountPricePreliminaryRreview/children/components/CreditLimitReview.vue b/pages/work/AccountPricePreliminaryRreview/children/components/CreditLimitReview.vue
new file mode 100644
index 0000000..abff523
--- /dev/null
+++ b/pages/work/AccountPricePreliminaryRreview/children/components/CreditLimitReview.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/AccountPricePreliminaryRreview/children/components/PriceReview.vue b/pages/work/AccountPricePreliminaryRreview/children/components/PriceReview.vue
new file mode 100644
index 0000000..3f19c48
--- /dev/null
+++ b/pages/work/AccountPricePreliminaryRreview/children/components/PriceReview.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/AccountPricePreliminaryRreview/index.vue b/pages/work/AccountPricePreliminaryRreview/index.vue
new file mode 100644
index 0000000..83307d3
--- /dev/null
+++ b/pages/work/AccountPricePreliminaryRreview/index.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+ 公司名称
+ 地域
+ 账期审核
+ 额度审核
+ 价格审核
+
+
+ {{ index + 1 }}
+ {{ item.userName }}
+ {{ item.areaName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/OrderManager/index.vue b/pages/work/OrderManager/index.vue
index 42fd51f..389af08 100644
--- a/pages/work/OrderManager/index.vue
+++ b/pages/work/OrderManager/index.vue
@@ -28,15 +28,12 @@
@confirm="getTableData"/>
-
+
+
+
+
+
+
-
+
diff --git a/pages/work/OrderSearchQuery/index.vue b/pages/work/OrderSearchQuery/index.vue
new file mode 100644
index 0000000..4e912fe
--- /dev/null
+++ b/pages/work/OrderSearchQuery/index.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 3df6c84..e6726f1 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -39,6 +39,29 @@
商务审批
+
+
+
+ 订单综合查询
+
+
+
+
+
+
+
+
+
+
+ 账期价格初审
+
+
+
+
+
+ 账期价格复审
+
+
@@ -100,6 +123,7 @@
-
-
-
-
-
-