diff --git a/api/materialManagement/MaterialRequsition.js b/api/materialManagement/MaterialRequsition.js
new file mode 100644
index 0000000..fa8564e
--- /dev/null
+++ b/api/materialManagement/MaterialRequsition.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+
+export function getIngredientTask(data) {
+ return request({
+ url: '/mes/mm/materialinput/getIngredientTask',
+ method: 'post',
+ data
+ })
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 75384b0..a079770 100644
--- a/pages.json
+++ b/pages.json
@@ -208,6 +208,14 @@
"navigationBarTitleText" : "仓库配料",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/materialManagement/MaterialRequisition/MaterialRequisition",
+ "style" :
+ {
+ "navigationBarTitleText" : "车间叫料",
+ "enablePullDownRefresh" : false
+ }
}
]
diff --git a/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue b/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
index a1f3052..1f016ba 100644
--- a/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
+++ b/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
@@ -89,6 +89,8 @@
+
+
@@ -112,7 +114,8 @@ export default {
show: false,
title: '生成配料任务',
content: ''
- }
+ },
+ loading:false
};
},
filters: {
@@ -156,6 +159,8 @@ export default {
},
//todo 根据日期获取工单
get_workorder_list() {
+
+ this.loading=true;
// let date = new Date(this.workerorder_time);
// date = new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
@@ -173,6 +178,7 @@ export default {
};
getworkorderlist(query).then((res) => {
if (res.code == 200) {
+ this.loading=false;
this.workerorder_list = res.data;
for (let item = 0; item < this.workerorder_list.length; item++) {
diff --git a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
new file mode 100644
index 0000000..8e254ad
--- /dev/null
+++ b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+ 选择日期
+
+
+
+ {{ queryParams.workerorder_time | formatDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/materialManagement/materialManagement.vue b/pages/materialManagement/materialManagement.vue
index e4a9c42..dc72d48 100644
--- a/pages/materialManagement/materialManagement.vue
+++ b/pages/materialManagement/materialManagement.vue
@@ -35,7 +35,7 @@
{
name: '车间叫料',
icon: 'grid-fill',
- url: 'pages/materialManagement/MaterialProductionInput/MaterialProductionInput',
+ url: '/pages/materialManagement/MaterialRequisition/MaterialRequisition',
type: 1,
index: 2
},