From d8ffff6bd9c7adb24cc4b86635c2e0ce8fa5e2a8 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 16 Jul 2024 22:42:35 +0800
Subject: [PATCH] add feeding record

---
 src/api/mes/product.js                |  18 ++
 src/api/mes/record.js                 |   2 +-
 src/config.js                         |   2 +-
 src/page_record/feedingRecordForm.vue | 188 ++++++++++++++
 src/page_record/reportForm.vue        | 336 --------------------------
 src/pages.json                        |  11 +
 src/pages/report.vue                  |   8 +
 src/pages/work.vue                    |  17 +-
 8 files changed, 239 insertions(+), 343 deletions(-)
 create mode 100644 src/api/mes/product.js
 create mode 100644 src/page_record/feedingRecordForm.vue
 delete mode 100644 src/page_record/reportForm.vue

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 @@
+<template>
+	<view class="container">
+
+    <view class="example">
+      <uni-forms ref="customForm" :rules="customRules" labelWidth="60px" :modelValue="formData">
+        <uni-forms-item label="制浆线" required name="feedingPipeline">
+          <uni-data-checkbox v-model="formData.feedingPipeline" :localdata="pipelineTypes()" />
+        </uni-forms-item>
+        <uni-forms-item label="投料类型" required name="feedingType">
+          <uni-data-checkbox v-model="formData.feedingType" :localdata="feedingTypes()" @change="handleTypeChange"/>
+        </uni-forms-item>
+        <uni-forms-item v-if="formData.feedingType==='wet' || formData.feedingType==='dry'" label="重量/kg"  name="weight">
+          <uni-easyinput type="number" v-model="formData.weight" placeholder="" />
+        </uni-forms-item>
+        <uni-forms-item label="备注"  name="remark">
+          <uni-easyinput v-model="formData.remark" placeholder="" />
+        </uni-forms-item>
+        <uni-group title="card 模式" mode="card" v-for="(item,index) in formData.productList" :key="item.id"
+                   :name="['productList',index,'value']">
+          <template v-slot:title>
+            <view class="uni-group-title">
+              <uni-row>
+                <uni-col :span="18">
+                  <uni-forms-item  label="原料" required name="itemId">
+                    <uni-data-select placement="top" v-model="formData.productList[index].itemId" :localdata="itemList"></uni-data-select>
+                  </uni-forms-item>
+                </uni-col>
+                <uni-col :span="6" align="center">
+                  <uni-icons type="trash" size="25" color="red" @click="del(item.id)"></uni-icons>
+                </uni-col>
+              </uni-row>
+            </view>
+          </template>
+          <uni-forms-item  label="单位" required name="unitId">
+            <uni-data-select v-model="formData.productList[index].unitId" :localdata="unitList"></uni-data-select>
+          </uni-forms-item>
+          <uni-forms-item label="数量" required name="weight">
+            <uni-easyinput type="number" v-model="formData.productList[index].weight"/>
+          </uni-forms-item>
+
+        </uni-group>
+      </uni-forms>
+      <view class="button-group">
+        <button v-if="formData.feedingType==='org'" type="primary" size="mini" @click="add">
+          <uni-icons type="plus" size="15"></uni-icons>
+          添加原料
+        </button>
+        <button type="primary" size="mini" @click="submit('customForm')">保存</button>
+      </view>
+    </view>
+	</view>
+</template>
+
+<script>
+import {create} from "@/api/mes/record"
+import {getUnitList,getItemList} from "@/api/mes/product"
+import { pipelineTypes,feedingTypes, findTextByValue} from "@/api/system/dict/data";
+import {showConfirm} from "@/utils/common";
+import tab from "@/plugins/tab";
+import modal from "@/plugins/modal";
+export default {
+  components: {},
+  data() {
+    return {
+      // 自定义表单数据
+      formData: {
+        id: undefined,
+        feedingPipeline: undefined,
+        feedingType: undefined,
+        weight: undefined,
+        remark: undefined,
+        productList: []
+      },
+      // 自定义表单校验规则
+      customRules: {
+        feedingPipeline: {rules: [{required: true, errorMessage: '姓名不能为空'}]},
+        feedingType: {rules: [{required: true, errorMessage: '工位不能为空'}]},
+        productList: {rules: [
+            {format: 'array', errorMessage: '产品列表格式错误'},
+            {validateFunction: function(rule, value, data, callback) {
+              if (value.length < 2) {
+                callback('产品信息不能为空')
+              }
+              return true
+            }
+          }]
+        }
+      },
+      itemList:[],
+      unitList:[]
+    }
+  },
+  computed: {
+  },
+  onLoad() {
+    this.getItemList()
+  },
+  onReady() {
+    // 设置自定义表单校验规则，必须在节点渲染完毕后执行
+    this.$refs.customForm.setRules(this.customRules)
+  },
+  methods: {
+    pipelineTypes() {return pipelineTypes},
+    feedingTypes() {return feedingTypes},
+    submit(ref) {
+      this.$refs[ref].validate().then(res => {
+        var ok = 1;
+        if(this.formData.productList && this.formData.productList.length > 0) {
+          for (let i = 0; i < this.formData.productList.length; i++) {
+            if(!this.formData.productList[i].itemId || this.formData.productList[i].itemId===''
+             || !this.formData.productList[i].weight|| this.formData.productList[i].weight <= 0) {
+              ok = 0;
+              uni.showToast({
+                title: `原料信息不能为空！`,
+                icon: 'error'
+              })
+              break;
+            }
+          }
+        }
+        if(ok===1){
+          showConfirm("确认保存投料记录单吗？").then(res => {
+            if (res.confirm) {
+              create(this.formData).then(response => {
+                modal.msgSuccess("保存成功")
+                tab.navigateBack()
+              })
+            }
+          })
+        }
+      }).catch(err => {
+        console.log('err', err);
+      })
+    },
+    handleTypeChange(e){
+      this.formData.feedingType =e.detail.value;
+      if(this.formData.feedingType === 'wet' || this.formData.feedingType==='dry'){
+        this.formData.productList = []
+      }
+    },
+    getItemList() {
+      getItemList().then(response => {
+        this.itemList = response.data;
+      })
+      getUnitList().then(response => {
+        this.unitList = response.data;
+      })
+    },
+    add() {
+      this.formData.productList.push({
+        id: Date.now(),
+        itemId: undefined,
+        unitId: 3,
+        weight: 0
+      })
+    },
+    del(id) {
+      let index = this.formData.productList.findIndex(v => v.id === id)
+      this.formData.productList.splice(index, 1)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+	.example {
+		padding: 15px;
+		background-color: #fff;
+	}
+
+  .button-group {
+    margin-top: 15px;
+    display: flex;
+    justify-content: space-around;
+  }
+
+  .button {
+    display: flex;
+    align-items: center;
+    height: 35px;
+    line-height: 35px;
+    margin-left: 10px;
+  }
+  .uni-group-title{
+    padding-top: 5px;
+    background-color: #f4c7c7;
+  }
+</style>
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 @@
-<template>
-	<view class="container">
-		<uni-card :is-shadow="false" is-full>
-			<text class="uni-h6">uni-forms 组件一般由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据。</text>
-		</uni-card>
-		<uni-section title="基本用法" type="line">
-			<view class="example">
-				<!-- 基础用法，不包含校验规则 -->
-				<uni-forms ref="baseForm" :model="baseFormData" labelWidth="80px">
-					<uni-forms-item label="姓名" required>
-						<uni-easyinput v-model="baseFormData.name" placeholder="请输入姓名" />
-					</uni-forms-item>
-					<uni-forms-item label="年龄" required>
-						<uni-easyinput v-model="baseFormData.age" placeholder="请输入年龄" />
-					</uni-forms-item>
-					<uni-forms-item label="性别" required>
-						<uni-data-checkbox v-model="baseFormData.sex" :localdata="sexs" />
-					</uni-forms-item>
-					<uni-forms-item label="兴趣爱好" required>
-						<uni-data-checkbox v-model="baseFormData.hobby" multiple :localdata="hobbys" />
-					</uni-forms-item>
-					<uni-forms-item label="自我介绍">
-						<uni-easyinput type="textarea" v-model="baseFormData.introduction" placeholder="请输入自我介绍" />
-					</uni-forms-item>
-					<uni-forms-item label="日期时间">
-						<uni-datetime-picker type="datetime" return-type="timestamp"
-							v-model="baseFormData.datetimesingle" />
-					</uni-forms-item>
-					<uni-forms-item label="选择城市">
-						<uni-data-picker v-model="baseFormData.city" :localdata="cityData" popup-title="选择城市">
-						</uni-data-picker>
-					</uni-forms-item>
-
-					<uni-forms-item label="选择技能">
-						<uni-data-select v-model="baseFormData.skills" :localdata="skillsRange" >
-						</uni-data-select>
-					</uni-forms-item>
-				</uni-forms>
-			</view>
-		</uni-section>
-
-		<uni-section title="表单校验" type="line">
-			<view class="example">
-				<!-- 基础表单校验 -->
-				<uni-forms ref="valiForm" :rules="rules" :model="valiFormData" labelWidth="80px">
-					<uni-forms-item label="姓名" required name="name">
-						<uni-easyinput v-model="valiFormData.name" placeholder="请输入姓名" />
-					</uni-forms-item>
-					<uni-forms-item label="年龄" required name="age">
-						<uni-easyinput v-model="valiFormData.age" placeholder="请输入年龄" />
-					</uni-forms-item>
-					<uni-forms-item label="自我介绍">
-						<uni-easyinput type="textarea" v-model="valiFormData.introduction" placeholder="请输入自我介绍" />
-					</uni-forms-item>
-				</uni-forms>
-				<button type="primary" @click="submit('valiForm')">提交</button>
-			</view>
-		</uni-section>
-
-		<uni-section title="自定义校验规则" type="line">
-			<view class="example">
-				<!-- 自定义表单校验 -->
-				<uni-forms ref="customForm" :rules="customRules" labelWidth="80px" :modelValue="customFormData">
-					<uni-forms-item label="姓名" required name="name">
-						<uni-easyinput v-model="customFormData.name" placeholder="请输入姓名" />
-					</uni-forms-item>
-					<uni-forms-item label="年龄" required name="age">
-						<uni-easyinput v-model="customFormData.age" placeholder="请输入年龄" />
-					</uni-forms-item>
-					<uni-forms-item label="兴趣爱好" required name="hobby">
-						<uni-data-checkbox v-model="customFormData.hobby" multiple :localdata="hobbys" />
-					</uni-forms-item>
-				</uni-forms>
-				<button type="primary" @click="submit('customForm')">提交</button>
-			</view>
-		</uni-section>
-
-
-		<uni-section title="动态表单" type="line">
-			<view class="example">
-				<!-- 动态表单校验 -->
-				<uni-forms ref="dynamicForm" :rules="dynamicRules" :model="dynamicFormData" labelWidth="80px">
-					<uni-forms-item label="邮箱" required name="email">
-						<uni-easyinput v-model="dynamicFormData.email" placeholder="请输入姓名" />
-					</uni-forms-item>
-					<uni-forms-item v-for="(item,index) in dynamicFormData.domains" :key="item.id"
-						:label="item.label+' '+index" required :rules="item.rules" :name="['domains',index,'value']">
-						<view class="form-item">
-							<uni-easyinput v-model="dynamicFormData.domains[index].value" placeholder="请输入域名" />
-							<button class="button" size="mini" type="default" @click="del(item.id)">删除</button>
-						</view>
-					</uni-forms-item>
-				</uni-forms>
-				<view class="button-group">
-					<button type="primary" size="mini" @click="add">新增域名</button>
-					<button type="primary" size="mini" @click="submit('dynamicForm')">提交</button>
-				</view>
-			</view>
-		</uni-section>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				// 基础表单数据
-				baseFormData: {
-					name: '',
-					age: '',
-					introduction: '',
-					sex: 2,
-					hobby: [5],
-					datetimesingle: 1627529992399,
-					city: '',
-					skills: 0
-				},
-				// 城市数据
-				cityData: [{
-					text: "北京",
-					value: "10001",
-				}, {
-					text: "上海",
-					value: "10002",
-				}, {
-					text: "深圳",
-					value: "10004",
-				}],
-				skillsRange: [{
-						value: 0,
-						text: "编程"
-					},
-					{
-						value: 1,
-						text: "绘画"
-					},
-					{
-						value: 2,
-						text: "运动"
-					},
-				],
-				// 表单数据
-				alignmentFormData: {
-					name: '',
-					age: '',
-				},
-				// 单选数据源
-				sexs: [{
-					text: '男',
-					value: 0
-				}, {
-					text: '女',
-					value: 1
-				}, {
-					text: '保密',
-					value: 2
-				}],
-				// 多选数据源
-				hobbys: [{
-					text: '跑步',
-					value: 0
-				}, {
-					text: '游泳',
-					value: 1
-				}, {
-					text: '绘画',
-					value: 2
-				}, {
-					text: '足球',
-					value: 3
-				}, {
-					text: '篮球',
-					value: 4
-				}, {
-					text: '其他',
-					value: 5
-				}],
-				// 分段器数据
-				current: 0,
-				items: ['左对齐', '顶部对齐'],
-				// 校验表单数据
-				valiFormData: {
-					name: '',
-					age: '',
-					introduction: '',
-				},
-				// 校验规则
-				rules: {
-					name: {
-						rules: [{
-							required: true,
-							errorMessage: '姓名不能为空'
-						}]
-					},
-					age: {
-						rules: [{
-							required: true,
-							errorMessage: '年龄不能为空'
-						}, {
-							format: 'number',
-							errorMessage: '年龄只能输入数字'
-						}]
-					}
-				},
-				// 自定义表单数据
-				customFormData: {
-					name: '',
-					age: '',
-					hobby: []
-				},
-				// 自定义表单校验规则
-				customRules: {
-					name: {
-						rules: [{
-							required: true,
-							errorMessage: '姓名不能为空'
-						}]
-					},
-					age: {
-						rules: [{
-							required: true,
-							errorMessage: '年龄不能为空'
-						}]
-					},
-					hobby: {
-						rules: [{
-								format: 'array'
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									if (value.length < 2) {
-										callback('请至少勾选两个兴趣爱好')
-									}
-									return true
-								}
-							}
-						]
-					}
-
-				},
-				dynamicFormData: {
-					email: '',
-					domains: []
-				},
-				dynamicLists: [],
-				dynamicRules: {
-					email: {
-						rules: [{
-							required: true,
-							errorMessage: '域名不能为空'
-						}, {
-							format: 'email',
-							errorMessage: '域名格式错误'
-						}]
-					}
-				}
-			}
-		},
-		computed: {
-			// 处理表单排列切换
-			alignment() {
-				if (this.current === 0) return 'left'
-				if (this.current === 1) return 'top'
-				return 'left'
-			}
-		},
-		onLoad() {},
-		onReady() {
-			// 设置自定义表单校验规则，必须在节点渲染完毕后执行
-			this.$refs.customForm.setRules(this.customRules)
-		},
-		methods: {
-			onClickItem(e) {
-				console.log(e);
-				this.current = e.currentIndex
-			},
-			add() {
-				this.dynamicFormData.domains.push({
-					label: '域名',
-					value: '',
-					rules: [{
-						'required': true,
-						errorMessage: '域名项必填'
-					}],
-					id: Date.now()
-				})
-			},
-			del(id) {
-				let index = this.dynamicLists.findIndex(v => v.id === id)
-				this.dynamicLists.splice(index, 1)
-			},
-			submit(ref) {
-				console.log(this.baseFormData);
-				this.$refs[ref].validate().then(res => {
-					console.log('success', res);
-					uni.showToast({
-						title: `校验通过`
-					})
-				}).catch(err => {
-					console.log('err', err);
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.example {
-		padding: 15px;
-		background-color: #fff;
-	}
-
-	.segmented-control {
-		margin-bottom: 15px;
-	}
-
-	.button-group {
-		margin-top: 15px;
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.form-item {
-		display: flex;
-		align-items: center;
-		flex: 1;
-	}
-
-	.button {
-		display: flex;
-		align-items: center;
-		height: 35px;
-		line-height: 35px;
-		margin-left: 10px;
-	}
-</style>
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 @@
         </el-row>
       </el-collapse-item>
     </el-collapse>
+    <uni-fab  ref="fab" :pattern="pattern" @fabClick="handleAdd" />
   </view>
 </template>
 
@@ -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')
 }
 </script>