diff --git a/src/api/mes/product.js b/src/api/mes/product.js
new file mode 100644
index 0000000..b12af00
--- /dev/null
+++ b/src/api/mes/product.js
@@ -0,0 +1,18 @@
+
+import request from '@/utils/request'
+
+
+// 单位列表
+export function getUnitList() {
+ return request({
+ url: '/admin-api/mes/app/product/getUnitList',
+ method: 'get'
+ })
+}
+// 原料列表
+export function getItemList() {
+ return request({
+ url: '/admin-api/mes/app/product/getItemList',
+ method: 'get'
+ })
+}
diff --git a/src/api/mes/record.js b/src/api/mes/record.js
index c81f4b1..0ed1308 100644
--- a/src/api/mes/record.js
+++ b/src/api/mes/record.js
@@ -27,7 +27,7 @@ export function create(data) {
return request({
url: '/admin-api/mes/feeding-record/create',
method: 'post',
- params: data
+ data: data
})
}
// 更新
diff --git a/src/config.js b/src/config.js
index 01f1100..e3d4cf7 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,7 +1,7 @@
// 应用全局配置
const config = {
// baseUrl: 'http://47.106.185.127:48080',127.0.0.1
- baseUrl: 'http://127.0.0.1:48080',
+ baseUrl: 'http://47.106.185.127:48080',
// 应用信息
appInfo: {
// 应用名称
diff --git a/src/page_record/feedingRecordForm.vue b/src/page_record/feedingRecordForm.vue
new file mode 100644
index 0000000..386563d
--- /dev/null
+++ b/src/page_record/feedingRecordForm.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/page_record/reportForm.vue b/src/page_record/reportForm.vue
deleted file mode 100644
index c39b8f3..0000000
--- a/src/page_record/reportForm.vue
+++ /dev/null
@@ -1,336 +0,0 @@
-
-
-
- uni-forms 组件一般由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages.json b/src/pages.json
index 3ab28ee..7d1face 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -84,6 +84,17 @@
}
]
},
+ {
+ "root": "page_record",
+ "pages": [
+ {
+ "path": "feedingRecordForm",
+ "style": {
+ "navigationBarTitleText": "新增投料记录"
+ }
+ }
+ ]
+ },
{
"root": "pages_mine/pages",
"pages": [
diff --git a/src/pages/report.vue b/src/pages/report.vue
index 3ce1137..088aeaa 100644
--- a/src/pages/report.vue
+++ b/src/pages/report.vue
@@ -177,6 +177,12 @@ export default {
this.getUserList()
this.loading = false
},
+ onPullDownRefresh() {
+ console.log('refresh');
+ setTimeout(function () {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
methods: {
processTypes() {
return processTypes
@@ -201,6 +207,7 @@ export default {
timestampToTime,
getOtherReportList(){
let date = this.valiFormData.reportDateString
+ if(date.length<5)date = getCurrentDate()
this.valiFormData.reportDate = [date+' 00:00:00', date+' 23:59:59']
this.valiFormData.reportType = '个人'
getOtherList(this.valiFormData).then(response => {
@@ -209,6 +216,7 @@ export default {
},
getReplaceReportList(){
let date = this.valiFormData.reportDateString
+ if(date.length<5)date = getCurrentDate()
this.valiFormData.reportDate = [date+' 00:00:00', date+' 23:59:59']
this.valiFormData.reportType = '代报工'
getOtherList(this.valiFormData).then(response => {
diff --git a/src/pages/work.vue b/src/pages/work.vue
index 5a7d762..b76ef61 100644
--- a/src/pages/work.vue
+++ b/src/pages/work.vue
@@ -76,6 +76,7 @@
+
@@ -88,13 +89,19 @@ import {Tickets} from "@element-plus/icons-vue";
import modal from "@/plugins/modal";
import tab from "@/plugins/tab";
import {showConfirm} from "@/utils/common";
-import auth from "@/plugins/auth";
+
//已经提交的列表
const finishList = ref([]);
//草稿状态的列表
const draftList = ref([]);
-
+const pattern = {
+ color: '#7A7E83',
+ backgroundColor: '#fff',
+ selectedColor: '#007AFF',
+ buttonColor: '#f4c7c7',
+ iconColor: '#fff'
+}
onMounted(() => {
getList()
@@ -141,9 +148,9 @@ function handleDelete(id){
})
}
-//看进度
-function planProgress(plan){
- tab.navigateTo('/page_report/planProgress',plan)
+//新增记录
+function handleAdd(){
+ tab.navigateTo('/page_record/feedingRecordForm')
}