diff --git a/mes-ui/mini-app/src/pages.json b/mes-ui/mini-app/src/pages.json
index 62d329d..6461dba 100644
--- a/mes-ui/mini-app/src/pages.json
+++ b/mes-ui/mini-app/src/pages.json
@@ -140,7 +140,19 @@
{
"navigationBarTitleText" : "消息通知"
}
- }
+ } ,
+ {
+ "path": "pages/cgdsp/cgdsp-detail",
+ "style": {
+ "navigationBarTitleText": "详情"
+ }
+ },
+ {
+ "path": "pages/cgdsp/cgdsp",
+ "style": {
+ "navigationBarTitleText": "采购单审批"
+ }
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue b/mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue
new file mode 100644
index 0000000..5f8a37f
--- /dev/null
+++ b/mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue
@@ -0,0 +1,442 @@
+
+
+
+
+
+ 采购单号:
+ ( 单号:{{ detailInfo.purchaseNo }} )
+
+
+ 采购类型:{{ detailInfo.purchaseOrderType }}
+ 项目名称:{{ detailInfo.projectName }}
+ 客户简码:{{ detailInfo. brief}}
+ 送审人:{{ detailInfo.submitUserName }}
+ 送审时间:{{ formatDate( detailInfo.submitTime, 'YYYY-MM-DD')}}
+
+
+
+
+ 子项目信息
+
+
+ 序号
+ 项目名称
+ 物料名称
+ 工序
+ 采购数量
+ 供应商
+ 需要完成日期
+ 预计到货日期
+ 预估总价
+ 技术要求
+ 理论重量(吨)
+
+
+
+
+ {{ index + 1 }}
+ {{ item.name }}
+ {{ item.boomName }}
+ {{ item.procedureName }}
+ {{ item.purchaseAmount }}
+ {{ item.supplierName }}
+ {{ formatDate(item.requireTime, 'YYYY-MM-DD') }}
+ {{ formatDate(item.arriveTime, 'YYYY-MM-DD') }}
+ {{ item.estimatedPrice }}
+ {{ item.description }}
+ {{ item.theWeight }}
+
+
+
+
+
+
+ 操作日志
+
+
+ 操作
+ 操作人
+ 操作时间
+
+
+ {{ item.operation }}
+ {{ item.operationName }}
+ {{ formatDate(item.operationTime,'YYYY-MM-DD') }}
+
+
+
+
+ 取消
+
+ 批准
+ 打回
+
+
+
+
+ 加载中..
+
+
+
+
+
+
+
+
diff --git a/mes-ui/mini-app/src/pages/cgdsp/cgdsp.vue b/mes-ui/mini-app/src/pages/cgdsp/cgdsp.vue
new file mode 100644
index 0000000..8694780
--- /dev/null
+++ b/mes-ui/mini-app/src/pages/cgdsp/cgdsp.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mes-ui/mini-app/src/pages/cgdsp/components/dataItem.vue b/mes-ui/mini-app/src/pages/cgdsp/components/dataItem.vue
new file mode 100644
index 0000000..e213c35
--- /dev/null
+++ b/mes-ui/mini-app/src/pages/cgdsp/components/dataItem.vue
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+ 采购单号:
+ ( 单号:{{ item.purchaseNo }} )
+
+
+ 采购类型:{{ item.purchaseOrderType }}
+ 项目名称:{{ item.projectName }}
+ 客户简码:{{ item.brief }}
+ 送审人:{{ item.submitUserName }}
+ 送审时间:{{ item.submitTime }}
+
+ {{ statusText }}
+
+
+
+ {{ isFinish ? '没有更多数据~' : '正在加载...' }}
+
+
+
+
+
+import type { stringify } from 'querystring';
diff --git a/mes-ui/mini-app/src/pages/cgdsp/components/showFileWx.vue b/mes-ui/mini-app/src/pages/cgdsp/components/showFileWx.vue
new file mode 100644
index 0000000..5f211c5
--- /dev/null
+++ b/mes-ui/mini-app/src/pages/cgdsp/components/showFileWx.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue b/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue
index 887b3c0..62ab07c 100644
--- a/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue
+++ b/mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue
@@ -1,83 +1,86 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.unReadCount }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.unReadCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mes-ui/mini-app/src/pages/index/index.vue b/mes-ui/mini-app/src/pages/index/index.vue
index 39fd7ac..8630acb 100644
--- a/mes-ui/mini-app/src/pages/index/index.vue
+++ b/mes-ui/mini-app/src/pages/index/index.vue
@@ -58,6 +58,13 @@ const categoryList = ref([
imgUrl: "/static/images/mojusheji.png",
defaultImgUrl: "/static/images/assembleReport-default.png",
},
+ {
+ path: "cgdsp",
+ name: "采购单审批",
+ auth: true,
+ imgUrl: "/static/images/pic_cgdsp.png",
+ defaultImgUrl: "/static/images/pic_cgdsp.png",
+ },
{
path: "messageNotification",
name: "消息通知",
@@ -94,6 +101,7 @@ const getHomeCategory = async () => {
if (menus.length) {
const arr = [];
categoryList.value.forEach((e) => {
+ if (e.path === 'cgdsp') return;
const target = menus.find((q) => q.path == e.path);
e.auth = !!target;
});
diff --git a/mes-ui/mini-app/src/services/approveOrder.ts b/mes-ui/mini-app/src/services/approveOrder.ts
index 3ded08e..070faed 100644
--- a/mes-ui/mini-app/src/services/approveOrder.ts
+++ b/mes-ui/mini-app/src/services/approveOrder.ts
@@ -95,3 +95,33 @@ export const getDictAPI = (data: Object) => {
data,
})
}
+
+
+export const review = async(data:any) =>{
+ return http({
+ method: 'GET',
+ url: '/heli/purchase-order-make/review',
+ data,
+ })
+}
+ export const getReviewDetailAPI = (id:any) => {
+ return http({
+ method: 'GET',
+ url: '/heli/purchase-order-make/obtainReviewDetails?id='+id,
+ })
+ }
+
+
+ export const reject = (id:any) => {
+ return http({
+ method: 'GET',
+ url: '/heli/purchase-order-make/reject?id='+id,
+ })
+ }
+
+ export const approval = (id:any) => {
+ return http({
+ method: 'GET',
+ url: '/heli/purchase-order-make/approval?id='+id,
+ })
+ }
\ No newline at end of file
diff --git a/mes-ui/mini-app/src/static/images/pic_cgdsp.png b/mes-ui/mini-app/src/static/images/pic_cgdsp.png
new file mode 100644
index 0000000..d921190
Binary files /dev/null and b/mes-ui/mini-app/src/static/images/pic_cgdsp.png differ