diff --git a/jnpf-app/api/yys/materialProcurementOrder.js b/jnpf-app/api/yys/materialProcurementOrder.js
index e3099ec..5bcfbe6 100644
--- a/jnpf-app/api/yys/materialProcurementOrder.js
+++ b/jnpf-app/api/yys/materialProcurementOrder.js
@@ -2,14 +2,37 @@ import request from "@/utils/request";
// 采购协同列表-App
export function getOrderList(params) {
- let data = {
- orderStatus: params.orderStatus,
- moduleId: "591255416864768197",
- menuId: "591260119262560581",
- };
- return request({
- url: "/api/example/YysMaterialProcurementOrder/list",
- method: "POST",
- data,
- });
-}
\ No newline at end of file
+ let data = {
+ orderStatus: params.orderStatus,
+ moduleId: "591255416864768197",
+ menuId: "591260119262560581",
+ };
+ return request({
+ url: "/api/example/YysMaterialProcurementOrder/list",
+ method: "POST",
+ data,
+ });
+}
+// 接单-App
+export function takeOrder(params) {
+ let data = {
+ orderNumber: params.orderNumber,
+ };
+ return request({
+ url:
+ "/api/example/YysMaterialProcurementOrder/takeOrder/" + data.orderNumber,
+ method: "GET",
+ });
+}
+export function toProd(params) {
+ let data = {
+ orderNumber: params.orderNumber,
+ productionTime: params.productionTime,
+ productionNumber: params.productionNumber,
+ };
+ return request({
+ url: "/api/example/YysMaterialProcurementOrder/toProd",
+ method: "POST",
+ data,
+ });
+}
diff --git a/jnpf-app/package.json b/jnpf-app/package.json
index 6f645ce..ca02b28 100644
--- a/jnpf-app/package.json
+++ b/jnpf-app/package.json
@@ -10,9 +10,10 @@
"author": "",
"license": "ISC",
"dependencies": {
- "crypto-js": "^4.1.1"
+ "crypto-js": "^4.1.1",
+ "dayjs": "^1.11.12"
},
"extensions": {
"uni-cloud-push": {}
}
-}
\ No newline at end of file
+}
diff --git a/jnpf-app/pages/yys/materialProcurementOrder/components/CustomNavbar.vue b/jnpf-app/pages/yys/materialProcurementOrder/components/CustomNavbar.vue
index e87b785..9e107c0 100644
--- a/jnpf-app/pages/yys/materialProcurementOrder/components/CustomNavbar.vue
+++ b/jnpf-app/pages/yys/materialProcurementOrder/components/CustomNavbar.vue
@@ -1,23 +1,12 @@
-
-
+
-
+
diff --git a/jnpf-app/pages/yys/materialProcurementOrder/components/PopToProd.vue b/jnpf-app/pages/yys/materialProcurementOrder/components/PopToProd.vue
new file mode 100644
index 0000000..712d0e2
--- /dev/null
+++ b/jnpf-app/pages/yys/materialProcurementOrder/components/PopToProd.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+ 投产
+
+
+
+ 本次投产时间:
+
+ {{ productionTime }}
+
+
+
+
+ * 本次投产数量:
+
+
+
+
+
+
+
+ {{ orderItem.unit }}
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-app/pages/yys/materialProcurementOrder/index.vue b/jnpf-app/pages/yys/materialProcurementOrder/index.vue
index ac563d5..4dbfe89 100644
--- a/jnpf-app/pages/yys/materialProcurementOrder/index.vue
+++ b/jnpf-app/pages/yys/materialProcurementOrder/index.vue
@@ -34,83 +34,92 @@
-
- 接单
-
-
- 延期发货
-
-
- 缺货结单
-
-
- 投产
-
-
- 发货
-
+
+
+ 接单
+
+
+
+
+ 延期发货
+
+
+ 缺货结单
+
+
+ 投产
+
+
+ 发货
+
+
+
+