diff --git a/jnpf-app/api/yys/dayWork.js b/jnpf-app/api/yys/dayWork.js
new file mode 100644
index 0000000..0b3959d
--- /dev/null
+++ b/jnpf-app/api/yys/dayWork.js
@@ -0,0 +1,20 @@
+import request from "@/utils/request";
+
+// 报工确认列表-app
+export function confirm(params) {
+ let data = {
+ flag: params.flag,
+ };
+ return request({
+ url: "/api/example/YysDayWork/confirm",
+ method: "POST",
+ data,
+ });
+}
+// 获取用户列表-app
+export function userList() {
+ return request({
+ url: "/api/system/DataInterface/595963517819945029/Actions/Preview",
+ method: "POST",
+ });
+}
diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 40556df..4a6f0b2 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -64,6 +64,13 @@
"navigationBarTextStyle": "white"
}
},
+ {
+ "path": "pages/yys/dayWork/index",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
{
"path": "pages/login/index",
"style": {
diff --git a/jnpf-app/pages/work/components/CategoryPanel.vue b/jnpf-app/pages/work/components/CategoryPanel.vue
index b811f9e..b40b778 100644
--- a/jnpf-app/pages/work/components/CategoryPanel.vue
+++ b/jnpf-app/pages/work/components/CategoryPanel.vue
@@ -39,7 +39,7 @@
methods: {
handleToBooking(item) {
uni.navigateTo({
- url: '/pages/yys/materialProcurementOrder/index?test=1'
+ url: item.path
});
},
},
diff --git a/jnpf-app/pages/work/index.vue b/jnpf-app/pages/work/index.vue
index 5c2d6dc..05d327f 100644
--- a/jnpf-app/pages/work/index.vue
+++ b/jnpf-app/pages/work/index.vue
@@ -7,7 +7,6 @@
-
@@ -33,14 +32,14 @@ export default {
key: "product",
children: [
{
- path: "productionReport",
+ path: "/pages/yys/materialProcurementOrder/index",
name: "采购协同",
auth: true,
imgUrl: "/static/images/caigouxietong@1x.png",
defaultImgUrl: "/static/images/caigouxietong-wuquanxian@1x.png",
},
{
- path: "assembleReport",
+ path: "/pages/yys/dayWork/index",
name: "报工确认",
auth: true,
imgUrl: "/static/images/baogongqueren@1x.png",
diff --git a/jnpf-app/pages/yys/dayWork/components/CustomNavbar.vue b/jnpf-app/pages/yys/dayWork/components/CustomNavbar.vue
new file mode 100644
index 0000000..df81734
--- /dev/null
+++ b/jnpf-app/pages/yys/dayWork/components/CustomNavbar.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/jnpf-app/pages/yys/dayWork/components/PopSure.vue b/jnpf-app/pages/yys/dayWork/components/PopSure.vue
new file mode 100644
index 0000000..87a983e
--- /dev/null
+++ b/jnpf-app/pages/yys/dayWork/components/PopSure.vue
@@ -0,0 +1,448 @@
+
+
+
+
+
+
+ 报工确认
+
+
+
+ 机采数量:
+
+
+ {{ dataItem.isConfirmNums }}
+
+
+ 合格数量:
+
+
+
+
+
+ 次品数量:
+
+
+
+
+
+ 报工班组:
+
+
+ {{ dataItem.groupName }}
+
+
+
+ 报工成员(生成线报工)
+
+
+
+
+
+
+ 姓名
+
+
+
+
+ 报工数量
+
+
+
+
+ 补偿工时
+
+
+
+
+
+
+
+
+
+
+
+ {{ prodReportItem.reportMember }}
+
+
+
+
+ {{ dataItem.defectiveNum }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 报工成员(包装线报工)
+
+
+
+
+
+
+ 姓名
+
+
+
+
+ 报工数量
+
+
+
+
+ 补偿工时
+
+
+
+
+
+
+
+
+
+
+ {{ packageReportItem.reportMember }}
+
+
+ {{ dataItem.defectiveNum }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 领料上报
+
+
+
+
+
+
+ 材料名称
+
+
+
+
+ 当班领用
+
+
+
+
+ 本班结存
+
+
+
+
+
+
+
+
+
+ {{
+ requisitionReportItem.materialCode
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 报工确认
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-app/pages/yys/dayWork/index.vue b/jnpf-app/pages/yys/dayWork/index.vue
new file mode 100644
index 0000000..a24c49a
--- /dev/null
+++ b/jnpf-app/pages/yys/dayWork/index.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+ {{ orderItem.deviceCode }}({{ orderItem.deviceName }})
+
+
+
+
+ 生成日期:{{ fnFormat(orderItem.manufactureTime) }}
+
+
+ 产品名称:{{ orderItem.productName }}
+
+
+ 规格型号:{{ orderItem.models }}
+
+
+ 计划数量:{{ orderItem.planNumber }} {{ orderItem.measurementUnit }}
+
+
+ 待确认数量:{{ orderItem.isConfirmNums }}
+ {{ orderItem.measurementUnit }}
+
+
+ 班次:{{ orderItem.className }}
+
+
+ 开始结束时间:{{ orderItem.startTime }} - {{ orderItem.endTime }}
+
+
+
+
+
+ 去确认
+
+
+
+
+
+
+
+
+
+
+