From 90dc46c2a1fce1d2ea3e5814ae2c1f70d8d22138 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Fri, 19 Jul 2024 09:33:40 +0800
Subject: [PATCH] fix bug

---
 src/config.js                         |   2 +-
 src/page_record/feedingRecordForm.vue |  32 +--
 src/page_report/ViewForm.vue          | 323 ++++++++++++++++++++++++++
 src/page_report/replaceForm.vue       |  69 +++---
 src/page_report/reportForm.vue        | 103 ++++----
 src/pages.json                        |  18 ++
 src/pages/index.vue                   |  40 ++--
 src/pages/login.vue                   |   4 +-
 src/pages/report.vue                  |  35 ++-
 src/pages/work.vue                    |  24 +-
 10 files changed, 517 insertions(+), 133 deletions(-)
 create mode 100644 src/page_report/ViewForm.vue

diff --git a/src/config.js b/src/config.js
index e3d4cf7..01f1100 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://47.106.185.127:48080',
+  baseUrl: 'http://127.0.0.1:48080',
    // 应用信息
    appInfo: {
      // 应用名称
diff --git a/src/page_record/feedingRecordForm.vue b/src/page_record/feedingRecordForm.vue
index 386563d..ba4f169 100644
--- a/src/page_record/feedingRecordForm.vue
+++ b/src/page_record/feedingRecordForm.vue
@@ -15,14 +15,14 @@
         <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']">
+        <uni-group title="card 模式" mode="card" v-for="(item,index) in formData.feedingRecordDetails" :key="item.id"
+                   :name="['feedingRecordDetails',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-data-select placement="top" v-model="formData.feedingRecordDetails[index].itemId" :localdata="itemList"></uni-data-select>
                   </uni-forms-item>
                 </uni-col>
                 <uni-col :span="6" align="center">
@@ -32,10 +32,10 @@
             </view>
           </template>
           <uni-forms-item  label="单位" required name="unitId">
-            <uni-data-select v-model="formData.productList[index].unitId" :localdata="unitList"></uni-data-select>
+            <uni-data-select v-model="formData.feedingRecordDetails[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-easyinput type="number" v-model="formData.feedingRecordDetails[index].weight"/>
           </uni-forms-item>
 
         </uni-group>
@@ -67,15 +67,15 @@ export default {
         id: undefined,
         feedingPipeline: undefined,
         feedingType: undefined,
-        weight: undefined,
+        weight: 0,
         remark: undefined,
-        productList: []
+        feedingRecordDetails: []
       },
       // 自定义表单校验规则
       customRules: {
         feedingPipeline: {rules: [{required: true, errorMessage: '姓名不能为空'}]},
         feedingType: {rules: [{required: true, errorMessage: '工位不能为空'}]},
-        productList: {rules: [
+        feedingRecordDetails: {rules: [
             {format: 'array', errorMessage: '产品列表格式错误'},
             {validateFunction: function(rule, value, data, callback) {
               if (value.length < 2) {
@@ -105,10 +105,10 @@ export default {
     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) {
+        if(this.formData.feedingRecordDetails && this.formData.feedingRecordDetails.length > 0) {
+          for (let i = 0; i < this.formData.feedingRecordDetails.length; i++) {
+            if(!this.formData.feedingRecordDetails[i].itemId || this.formData.feedingRecordDetails[i].itemId===''
+             || !this.formData.feedingRecordDetails[i].weight|| this.formData.feedingRecordDetails[i].weight <= 0) {
               ok = 0;
               uni.showToast({
                 title: `原料信息不能为空！`,
@@ -135,7 +135,7 @@ export default {
     handleTypeChange(e){
       this.formData.feedingType =e.detail.value;
       if(this.formData.feedingType === 'wet' || this.formData.feedingType==='dry'){
-        this.formData.productList = []
+        this.formData.feedingRecordDetails = []
       }
     },
     getItemList() {
@@ -147,7 +147,7 @@ export default {
       })
     },
     add() {
-      this.formData.productList.push({
+      this.formData.feedingRecordDetails.push({
         id: Date.now(),
         itemId: undefined,
         unitId: 3,
@@ -155,8 +155,8 @@ export default {
       })
     },
     del(id) {
-      let index = this.formData.productList.findIndex(v => v.id === id)
-      this.formData.productList.splice(index, 1)
+      let index = this.formData.feedingRecordDetails.findIndex(v => v.id === id)
+      this.formData.feedingRecordDetails.splice(index, 1)
     }
   }
 }
diff --git a/src/page_report/ViewForm.vue b/src/page_report/ViewForm.vue
new file mode 100644
index 0000000..6d7e7b8
--- /dev/null
+++ b/src/page_report/ViewForm.vue
@@ -0,0 +1,323 @@
+<template>
+	<view class="container">
+		<uni-card :is-shadow="false" is-full>
+			<text class="uni-h6">如个人无法填报，请寻找主管代为报工</text>
+		</uni-card>
+    <view class="example">
+      <!-- 自定义表单校验 -->
+      <uni-forms ref="customForm" :rules="customRules" labelWidth="60px" :modelValue="customFormData">
+        <uni-forms-item label="工序" required name="orgType">
+          <uni-data-checkbox disabled v-model="customFormData.orgType" :localdata="processTypes()"  @change="handleOrgTypeChange" />
+        </uni-forms-item>
+        <uni-forms-item label="班别" required name="groupType">
+          <uni-data-checkbox disabled v-model="customFormData.groupType" :localdata="groupTypes()"  />
+        </uni-forms-item>
+        <uni-forms-item label="日期" required name="reportDateString">
+          <uni-datetime-picker disabled v-model="customFormData.reportDateString" type="date" :clear-icon="true"  @change="maskClick" />
+        </uni-forms-item>
+        <uni-forms-item label="工位" required name="orgId">
+          <uni-data-select disabled v-model="customFormData.orgId" :localdata="orgIdList"></uni-data-select>
+        </uni-forms-item>
+        <uni-forms-item label="计时时段" name="reportTime">
+          <uni-easyinput disabled type="text" v-model="customFormData.reportTime" placeholder="如:8:00-12:00" />
+        </uni-forms-item>
+        <uni-forms-item label="总计时/h" required name="totalTime">
+          <uni-easyinput disabled type="number" v-model="customFormData.totalTime" placeholder="" />
+        </uni-forms-item>
+        <uni-group title="card 模式" mode="card" v-for="(item,index) in customFormData.produceReportDetails" :key="item.id"
+                   :name="['produceReportDetails',index,'value']">
+          <template v-slot:title>
+            <view class="uni-group-title">
+              <uni-row>
+                <uni-col :span="20">
+                  <uni-forms-item  label="产品" required name="planId">
+                    <uni-data-select  disabled v-model="customFormData.produceReportDetails[index].planId" :localdata="planProductList"></uni-data-select>
+                  </uni-forms-item>
+                </uni-col>
+                <uni-col :span="4" align="center">
+<!--                  <button class="button" size="mini" type="warn" @click="del(item.id)">删除</button>-->
+<!--                  <uni-icons type="trash" size="25" color="red" @click="del(item.id)"></uni-icons>-->
+                </uni-col>
+              </uni-row>
+            </view>
+          </template>
+          <uni-row>
+            <uni-col :span="12">
+              <uni-forms-item label="成品数" required name="qualityNumber">
+                <uni-easyinput disabled type="number" v-model="customFormData.produceReportDetails[index].qualityNumber" @change="changeNumber(item.id)"/>
+              </uni-forms-item>
+            </uni-col>
+            <uni-col :span="12">
+              <uni-forms-item label="废品数" name="wasteNumber">
+                <uni-easyinput disabled type="number" v-model="customFormData.produceReportDetails[index].wasteNumber" @change="changeNumber(item.id)"/>
+              </uni-forms-item>
+            </uni-col>
+          </uni-row>
+          <uni-row>
+            <uni-col :span="12">
+              <uni-forms-item label="总数" name="totalNumber">
+                <uni-easyinput disabled v-model="customFormData.produceReportDetails[index].totalNumber" placeholder="" />
+              </uni-forms-item>
+            </uni-col>
+            <uni-col :span="12">
+              <uni-forms-item label="成品率%" required name="qualityRate">
+                <uni-easyinput disabled type="number" v-model="customFormData.produceReportDetails[index].qualityRate" />
+              </uni-forms-item>
+            </uni-col>
+          </uni-row>
+          <uni-row>
+            <uni-col :span="12">
+              <uni-forms-item label="打包数" name="packageNumber">
+                <uni-easyinput disabled type="number" v-model="customFormData.produceReportDetails[index].packageNumber" />
+              </uni-forms-item>
+            </uni-col>
+            <uni-col :span="12">
+              <uni-forms-item label="备注" name="remark">
+                <uni-easyinput disabled type="text" v-model="customFormData.produceReportDetails[index].remark" />
+              </uni-forms-item>
+            </uni-col>
+          </uni-row>
+        </uni-group>
+      </uni-forms>
+      <view class="button-group">
+<!--        <button type="primary" size="mini" @click="add">-->
+<!--          <uni-icons type="plus" size="15"></uni-icons>-->
+<!--          新增产品-->
+<!--        </button>-->
+        <button type="primary" size="mini" @click="handleBack">返回</button>
+      </view>
+    </view>
+	</view>
+</template>
+
+<script>
+
+import useUserStore from "@/store/modules/user";
+import {processTypes, groupTypes} from "@/api/system/dict/data";
+import {getOrgList, getProductList, createReport, getPlanProductList} from "@/api/mes/organization"
+import {getCurrentDate, timestampToTime} from "@/utils/dateUtil"
+import {showConfirm} from "@/utils/common";
+import tab from "@/plugins/tab";
+import modal from "@/plugins/modal";
+import {getById, getDetailByReportId, update} from "@/api/mes/report";
+const userStore = useUserStore()
+export default {
+  components: {},
+  data() {
+    return {
+      // 自定义表单数据
+      customFormData: {
+        id: undefined,
+        name: userStore.name,
+        userId: userStore.userId,
+        orgId: undefined,
+        orgType: undefined,
+        reportTime: undefined,
+        totalTime: 0,
+        reportStatus: undefined,
+        remark: undefined,
+        groupType: undefined,
+        reportType: undefined,
+        reportDateString: getCurrentDate(),
+        reportDate: undefined,
+        produceReportDetails: []
+      },
+      // 自定义表单校验规则
+      customRules: {
+        userId: {rules: [{required: true, errorMessage: '姓名不能为空'}]},
+        orgId: {rules: [{required: true, errorMessage: '工位不能为空'}]},
+        orgType: {rules: [{required: true, errorMessage: '工序不能为空'}]},
+        reportDateString: {rules: [{required: true, errorMessage: '报工日期不能为空'}]},
+        totalTime: {rules: [{required: true, errorMessage: '总计时不能为空'},
+            {format: 'number', errorMessage: '总计时格式错误，应填计时小时数'}]},
+        groupType: {rules: [{required: true, errorMessage: '班别不能为空'}]},
+        produceReportDetails: {rules: [
+            {format: 'array', errorMessage: '产品列表格式错误'},
+            {validateFunction: function(rule, value, data, callback) {
+              if (value.length < 2) {
+                callback('产品信息不能为空')
+              }
+              return true
+            }
+          }]
+        }
+      },
+      orgIdList:[],
+      planProductList:[],
+      updateId: undefined
+    }
+  },
+  computed: {
+  },
+  onLoad() {
+    this.getOrgIdList()
+    // this.getPlanProductList()
+    this.updateId = tab.getParams()
+    if(this.updateId){
+      this.disableEnable = true
+      //请求编辑数据
+      getById(this.updateId).then(response => {
+        this.customFormData = response.data
+        this.customFormData.reportDateString = timestampToTime(this.customFormData.reportDate)
+
+        getDetailByReportId(this.updateId).then(res => {
+          this.customFormData.produceReportDetails = res.data
+        })
+        this.getPlanProductList()
+      })
+    }
+  },
+  onReady() {
+    // 设置自定义表单校验规则，必须在节点渲染完毕后执行
+    this.$refs.customForm.setRules(this.customRules)
+  },
+  methods: {
+    processTypes() {
+      return processTypes
+    },
+    groupTypes() {
+      return groupTypes
+    },
+    submit(ref) {
+      if(this.customFormData.reportDateString.length<11)this.customFormData.reportDateString+=' 00:00:00';
+      this.customFormData.reportType = '个人';
+      console.log(this.customFormData);
+      this.$refs[ref].validate().then(res => {
+        var ok = 1;
+        if(this.customFormData.produceReportDetails && this.customFormData.produceReportDetails.length > 0) {
+          for (let i = 0; i < this.customFormData.produceReportDetails.length; i++) {
+            if(!this.customFormData.produceReportDetails[i].planId || this.customFormData.produceReportDetails[i].planId===''
+             || !this.customFormData.produceReportDetails[i].qualityNumber|| this.customFormData.produceReportDetails[i].qualityNumber <= 0) {
+              ok = 0;
+              uni.showToast({
+                title: `产品信息不能为空！`,
+                icon: 'error'
+              })
+              break;
+            }
+          }
+        }
+        if(ok===1){
+          showConfirm("确认保存生产报工单吗？").then(res => {
+            if (res.confirm) {
+              if(this.updateId){
+                this.customFormData.id = this.updateId
+                update(this.customFormData).then(response => {
+                  modal.msgSuccess("修改成功")
+                  tab.navigateBack()
+                })
+              }else {
+                this.customFormData.id = null
+                createReport(this.customFormData).then(response => {
+                  modal.msgSuccess("保存成功")
+                  tab.switchTab('/pages/report')
+                })
+              }
+            }
+          })
+        }
+      }).catch(err => {
+        console.log('err', err);
+      })
+    },
+    maskClick(e){
+      this.customFormData.reportDateString =e
+      this.getOrgIdList()
+    },
+    getOrgIdList() {
+      let data = {
+        'orgType': this.customFormData.orgType,
+        'reportDate': this.customFormData.reportDateString+" 00:00:00",
+        'groupType': this.customFormData.groupType
+      }
+      getOrgList(data).then(response => {
+        this.orgIdList = response.data;
+        if(!this.orgIdList || this.orgIdList.length===0){
+          uni.showToast({
+            title: '日期:'+this.customFormData.reportDateString+`未查询到工位安排！`,
+            icon: 'error'
+          })
+        }
+        else if(this.orgIdList.length===1){
+          this.customFormData.orgId = this.orgIdList[0].value
+        }
+      })
+    },
+    getPlanProductList() {
+      if(this.customFormData.orgType)
+        getPlanProductList(this.customFormData.orgType).then(response => {
+        this.planProductList = response.data;
+        if(!this.planProductList || this.orgIdList.planProductList===0){}
+      })
+    },
+    add() {
+      if(this.customFormData.orgType){
+        this.customFormData.produceReportDetails.push({
+          id: Date.now(),
+          productId: undefined,
+          planId: undefined,
+          qualityNumber: 0,
+          wasteNumber: 0,
+          totalNumber: 0,
+          qualityRate:0,
+          packageNumber: 0,
+          remark: ''
+        })
+      }else{
+        uni.showToast({
+          title: `请先选择工序！`,
+          icon: 'error'
+        })
+      }
+    },
+    del(id) {
+      let index = this.customFormData.produceReportDetails.findIndex(v => v.id === id)
+      this.customFormData.produceReportDetails.splice(index, 1)
+    },
+    changeNumber(id){
+      let index = this.customFormData.produceReportDetails.findIndex(v => v.id === id)
+      if(!this.customFormData.produceReportDetails[index].qualityNumber)
+        this.customFormData.produceReportDetails[index].qualityNumber=0;
+      if(!this.customFormData.produceReportDetails[index].wasteNumber)
+        this.customFormData.produceReportDetails[index].wasteNumber=0;
+
+      this.customFormData.produceReportDetails[index].totalNumber =
+          Number(this.customFormData.produceReportDetails[index].qualityNumber)  + Number(this.customFormData.produceReportDetails[index].wasteNumber);
+      this.customFormData.produceReportDetails[index].qualityRate =
+          (Number(this.customFormData.produceReportDetails[index].qualityNumber)*100/Number(this.customFormData.produceReportDetails[index].totalNumber)).toFixed(2);
+    },
+    handleOrgTypeChange(e){
+      console.log(e)
+      this.getPlanProductList()
+    },
+    handleBack(){
+      tab.navigateBack()
+    }
+  }
+}
+</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_report/replaceForm.vue b/src/page_report/replaceForm.vue
index 63ec286..89996cb 100644
--- a/src/page_report/replaceForm.vue
+++ b/src/page_report/replaceForm.vue
@@ -19,20 +19,20 @@
         <uni-forms-item v-if="customFormData.userId && customFormData.reportDateString" label="工位" required name="orgId">
           <uni-data-select v-model="customFormData.orgId" :localdata="orgIdList" :disabled="disableEnable" ></uni-data-select>
         </uni-forms-item>
-        <uni-forms-item label="计件时段" name="reportTime">
+        <uni-forms-item label="计时时段" name="reportTime">
           <uni-easyinput type="text" v-model="customFormData.reportTime" placeholder="如:8:00-12:00" />
         </uni-forms-item>
-        <uni-forms-item label="计件时间/h" required name="totalTime">
+        <uni-forms-item label="总计时/h" required name="totalTime">
           <uni-easyinput type="number" v-model="customFormData.totalTime" placeholder="" />
         </uni-forms-item>
-        <uni-group title="card 模式" mode="card" v-for="(item,index) in customFormData.productList" :key="item.id"
-                   :name="['productList',index,'value']">
+        <uni-group title="card 模式" mode="card" v-for="(item,index) in customFormData.produceReportDetails" :key="item.id"
+                   :name="['produceReportDetails',index,'value']">
           <template v-slot:title>
             <view class="uni-group-title">
               <uni-row>
                 <uni-col :span="20">
                   <uni-forms-item  label="产品" required name="planId">
-                    <uni-data-select v-model="customFormData.productList[index].planId" :localdata="planProductList" @change="handleProductChange"></uni-data-select>
+                    <uni-data-select v-model="customFormData.produceReportDetails[index].planId" :localdata="planProductList" @change="handleProductChange"></uni-data-select>
                   </uni-forms-item>
                 </uni-col>
                 <uni-col :span="4" align="center">
@@ -44,36 +44,36 @@
           <uni-row>
             <uni-col :span="12">
               <uni-forms-item label="成品数" required name="qualityNumber">
-                <uni-easyinput type="number" v-model="customFormData.productList[index].qualityNumber" @change="changeNumber(item.id)"/>
+                <uni-easyinput type="number" v-model="customFormData.produceReportDetails[index].qualityNumber" @change="changeNumber(item.id)"/>
               </uni-forms-item>
             </uni-col>
             <uni-col :span="12">
               <uni-forms-item label="废品数" name="wasteNumber">
-                <uni-easyinput type="number" v-model="customFormData.productList[index].wasteNumber" @change="changeNumber(item.id)"/>
+                <uni-easyinput type="number" v-model="customFormData.produceReportDetails[index].wasteNumber" @change="changeNumber(item.id)"/>
               </uni-forms-item>
             </uni-col>
           </uni-row>
           <uni-row>
             <uni-col :span="12">
               <uni-forms-item label="总数" name="totalNumber">
-                <uni-easyinput disabled v-model="customFormData.productList[index].totalNumber" placeholder="" />
+                <uni-easyinput disabled v-model="customFormData.produceReportDetails[index].totalNumber" placeholder="" />
               </uni-forms-item>
             </uni-col>
             <uni-col :span="12">
               <uni-forms-item label="成品率%" required name="qualityRate">
-                <uni-easyinput disabled type="number" v-model="customFormData.productList[index].qualityRate" />
+                <uni-easyinput disabled type="number" v-model="customFormData.produceReportDetails[index].qualityRate" />
               </uni-forms-item>
             </uni-col>
           </uni-row>
           <uni-row>
             <uni-col :span="12">
               <uni-forms-item label="打包数" name="packageNumber">
-                <uni-easyinput type="number" v-model="customFormData.productList[index].packageNumber" />
+                <uni-easyinput type="number" v-model="customFormData.produceReportDetails[index].packageNumber" />
               </uni-forms-item>
             </uni-col>
             <uni-col :span="12">
               <uni-forms-item label="备注" name="remark">
-                <uni-easyinput type="text" v-model="customFormData.productList[index].remark" />
+                <uni-easyinput type="text" v-model="customFormData.produceReportDetails[index].remark" />
               </uni-forms-item>
             </uni-col>
           </uni-row>
@@ -124,7 +124,7 @@ export default {
         reportType: undefined,
         reportDateString: getCurrentDate(),
         reportDate: undefined,
-        productList: []
+        produceReportDetails: []
       },
       // 自定义表单校验规则
       customRules: {
@@ -135,7 +135,7 @@ export default {
         totalTime: {rules: [{required: true, errorMessage: '计件时间不能为空'},
             {format: 'number', errorMessage: '计件时间格式错误，应填计件小时数'}]},
         groupType: {rules: [{required: true, errorMessage: '班别不能为空'}]},
-        productList: {rules: [
+        produceReportDetails: {rules: [
             {format: 'array', errorMessage: '产品列表格式错误'},
             {validateFunction: function(rule, value, data, callback) {
               console.log('value:'+value)
@@ -167,11 +167,16 @@ export default {
       getById(this.updateId).then(response => {
         this.customFormData = response.data
         this.customFormData.reportDateString = timestampToTime(this.customFormData.reportDate)
-        // this.getOrgIdList()
+        //请求工位列表
+        this.getOrgIdList()
+        //请求产品列表
+        this.getPlanProductList()
         getDetailByReportId(this.updateId).then(res => {
-          this.customFormData.productList = res.data
+          this.customFormData.produceReportDetails = res.data
         })
+
       })
+
     }
   },
   onReady() {
@@ -187,10 +192,10 @@ export default {
       console.log(this.customFormData);
       this.$refs[ref].validate().then(res => {
         var ok = 1;
-        if(this.customFormData.productList && this.customFormData.productList.length > 0) {
-          for (let i = 0; i < this.customFormData.productList.length; i++) {
-            if(!this.customFormData.productList[i].planId || this.customFormData.productList[i].planId===''
-             || !this.customFormData.productList[i].qualityNumber|| this.customFormData.productList[i].qualityNumber <= 0) {
+        if(this.customFormData.produceReportDetails && this.customFormData.produceReportDetails.length > 0) {
+          for (let i = 0; i < this.customFormData.produceReportDetails.length; i++) {
+            if(!this.customFormData.produceReportDetails[i].planId || this.customFormData.produceReportDetails[i].planId===''
+             || !this.customFormData.produceReportDetails[i].qualityNumber|| this.customFormData.produceReportDetails[i].qualityNumber <= 0) {
               ok = 0;
               uni.showToast({
                 title: `产品信息不能为空！`,
@@ -229,7 +234,6 @@ export default {
         this.getOrgIdList()
     },
     getOrgIdList() {
-      this.customFormData.orgId = undefined
       let dateStr = this.customFormData.reportDateString.length < 11 ?
           this.customFormData.reportDateString+" 00:00:00": this.customFormData.reportDateString;
       let data = {
@@ -246,6 +250,7 @@ export default {
             icon: 'error'
           })
         }
+        if(this.updateId){}
         else if(this.orgIdList.length===1){
           this.customFormData.orgId = this.orgIdList[0].value
         }
@@ -265,7 +270,7 @@ export default {
     },
     add() {
       if(this.customFormData.orgType){
-        this.customFormData.productList.push({
+        this.customFormData.produceReportDetails.push({
           id: Date.now(),
           productId: undefined,
           planId: undefined,
@@ -284,20 +289,20 @@ export default {
       }
     },
     del(id) {
-      let index = this.customFormData.productList.findIndex(v => v.id === id)
-      this.customFormData.productList.splice(index, 1)
+      let index = this.customFormData.produceReportDetails.findIndex(v => v.id === id)
+      this.customFormData.produceReportDetails.splice(index, 1)
     },
     changeNumber(id){
-      let index = this.customFormData.productList.findIndex(v => v.id === id)
-      if(!this.customFormData.productList[index].qualityNumber)
-        this.customFormData.productList[index].qualityNumber=0;
-      if(!this.customFormData.productList[index].wasteNumber)
-        this.customFormData.productList[index].wasteNumber=0;
+      let index = this.customFormData.produceReportDetails.findIndex(v => v.id === id)
+      if(!this.customFormData.produceReportDetails[index].qualityNumber)
+        this.customFormData.produceReportDetails[index].qualityNumber=0;
+      if(!this.customFormData.produceReportDetails[index].wasteNumber)
+        this.customFormData.produceReportDetails[index].wasteNumber=0;
 
-      this.customFormData.productList[index].totalNumber =
-          Number(this.customFormData.productList[index].qualityNumber)  + Number(this.customFormData.productList[index].wasteNumber);
-      this.customFormData.productList[index].qualityRate =
-          (Number(this.customFormData.productList[index].qualityNumber)*100/Number(this.customFormData.productList[index].totalNumber)).toFixed(2);
+      this.customFormData.produceReportDetails[index].totalNumber =
+          Number(this.customFormData.produceReportDetails[index].qualityNumber)  + Number(this.customFormData.produceReportDetails[index].wasteNumber);
+      this.customFormData.produceReportDetails[index].qualityRate =
+          (Number(this.customFormData.produceReportDetails[index].qualityNumber)*100/Number(this.customFormData.produceReportDetails[index].totalNumber)).toFixed(2);
     },
     handleUserChange(e){
       this.customFormData.userId = e
diff --git a/src/page_report/reportForm.vue b/src/page_report/reportForm.vue
index c57e8d4..cee49cf 100644
--- a/src/page_report/reportForm.vue
+++ b/src/page_report/reportForm.vue
@@ -18,23 +18,23 @@
         <uni-forms-item label="工位" required name="orgId">
           <uni-data-select v-model="customFormData.orgId" :localdata="orgIdList"></uni-data-select>
         </uni-forms-item>
-        <uni-forms-item label="计件时段" name="reportTime">
+        <uni-forms-item label="计时时段" name="reportTime">
           <uni-easyinput type="text" v-model="customFormData.reportTime" placeholder="如:8:00-12:00" />
         </uni-forms-item>
-        <uni-forms-item label="计件时间/h" required name="totalTime">
+        <uni-forms-item label="总计时/h" required name="totalTime">
           <uni-easyinput type="number" v-model="customFormData.totalTime" placeholder="" />
         </uni-forms-item>
-        <uni-group title="card 模式" mode="card" v-for="(item,index) in customFormData.productList" :key="item.id"
-                   :name="['productList',index,'value']">
+        <uni-group title="card 模式" mode="card" v-for="(item,index) in customFormData.produceReportDetails" :key="item.id"
+                   :name="['produceReportDetails',index,'value']">
           <template v-slot:title>
             <view class="uni-group-title">
               <uni-row>
-                <uni-col :span="12">
+                <uni-col :span="20">
                   <uni-forms-item  label="产品" required name="planId">
-                    <uni-data-select v-model="customFormData.productList[index].planId" :localdata="planProductList"></uni-data-select>
+                    <uni-data-select v-model="customFormData.produceReportDetails[index].planId" :localdata="planProductList"></uni-data-select>
                   </uni-forms-item>
                 </uni-col>
-                <uni-col :span="12" align="center">
+                <uni-col :span="4" align="center">
 <!--                  <button class="button" size="mini" type="warn" @click="del(item.id)">删除</button>-->
                   <uni-icons type="trash" size="25" color="red" @click="del(item.id)"></uni-icons>
                 </uni-col>
@@ -44,36 +44,36 @@
           <uni-row>
             <uni-col :span="12">
               <uni-forms-item label="成品数" required name="qualityNumber">
-                <uni-easyinput type="number" v-model="customFormData.productList[index].qualityNumber" @change="changeNumber(item.id)"/>
+                <uni-easyinput type="number" v-model="customFormData.produceReportDetails[index].qualityNumber" @change="changeNumber(item.id)"/>
               </uni-forms-item>
             </uni-col>
             <uni-col :span="12">
               <uni-forms-item label="废品数" name="wasteNumber">
-                <uni-easyinput type="number" v-model="customFormData.productList[index].wasteNumber" @change="changeNumber(item.id)"/>
+                <uni-easyinput type="number" v-model="customFormData.produceReportDetails[index].wasteNumber" @change="changeNumber(item.id)"/>
               </uni-forms-item>
             </uni-col>
           </uni-row>
           <uni-row>
             <uni-col :span="12">
               <uni-forms-item label="总数" name="totalNumber">
-                <uni-easyinput disabled v-model="customFormData.productList[index].totalNumber" placeholder="" />
+                <uni-easyinput disabled v-model="customFormData.produceReportDetails[index].totalNumber" placeholder="" />
               </uni-forms-item>
             </uni-col>
             <uni-col :span="12">
               <uni-forms-item label="成品率%" required name="qualityRate">
-                <uni-easyinput disabled type="number" v-model="customFormData.productList[index].qualityRate" />
+                <uni-easyinput disabled type="number" v-model="customFormData.produceReportDetails[index].qualityRate" />
               </uni-forms-item>
             </uni-col>
           </uni-row>
           <uni-row>
             <uni-col :span="12">
               <uni-forms-item label="打包数" name="packageNumber">
-                <uni-easyinput type="number" v-model="customFormData.productList[index].packageNumber" />
+                <uni-easyinput type="number" v-model="customFormData.produceReportDetails[index].packageNumber" />
               </uni-forms-item>
             </uni-col>
             <uni-col :span="12">
               <uni-forms-item label="备注" name="remark">
-                <uni-easyinput type="text" v-model="customFormData.productList[index].remark" />
+                <uni-easyinput type="text" v-model="customFormData.produceReportDetails[index].remark" />
               </uni-forms-item>
             </uni-col>
           </uni-row>
@@ -95,10 +95,11 @@
 import useUserStore from "@/store/modules/user";
 import {processTypes, groupTypes} from "@/api/system/dict/data";
 import {getOrgList, getProductList, createReport, getPlanProductList} from "@/api/mes/organization"
-import {getCurrentDate} from "@/utils/dateUtil"
+import {getCurrentDate, timestampToTime} from "@/utils/dateUtil"
 import {showConfirm} from "@/utils/common";
 import tab from "@/plugins/tab";
 import modal from "@/plugins/modal";
+import {getById, getDetailByReportId, update} from "@/api/mes/report";
 const userStore = useUserStore()
 export default {
   components: {},
@@ -119,7 +120,7 @@ export default {
         reportType: undefined,
         reportDateString: getCurrentDate(),
         reportDate: undefined,
-        productList: []
+        produceReportDetails: []
       },
       // 自定义表单校验规则
       customRules: {
@@ -127,10 +128,10 @@ export default {
         orgId: {rules: [{required: true, errorMessage: '工位不能为空'}]},
         orgType: {rules: [{required: true, errorMessage: '工序不能为空'}]},
         reportDateString: {rules: [{required: true, errorMessage: '报工日期不能为空'}]},
-        totalTime: {rules: [{required: true, errorMessage: '计件时间不能为空'},
-            {format: 'number', errorMessage: '计件时间格式错误，应填计件小时数'}]},
+        totalTime: {rules: [{required: true, errorMessage: '总计时不能为空'},
+            {format: 'number', errorMessage: '总计时格式错误，应填计时小时数'}]},
         groupType: {rules: [{required: true, errorMessage: '班别不能为空'}]},
-        productList: {rules: [
+        produceReportDetails: {rules: [
             {format: 'array', errorMessage: '产品列表格式错误'},
             {validateFunction: function(rule, value, data, callback) {
               if (value.length < 2) {
@@ -142,7 +143,8 @@ export default {
         }
       },
       orgIdList:[],
-      planProductList:[]
+      planProductList:[],
+      updateId: undefined
     }
   },
   computed: {
@@ -150,6 +152,20 @@ export default {
   onLoad() {
     this.getOrgIdList()
     // this.getPlanProductList()
+    this.updateId = tab.getParams()
+    if(this.updateId){
+      this.disableEnable = true
+      //请求编辑数据
+      getById(this.updateId).then(response => {
+        this.customFormData = response.data
+        this.customFormData.reportDateString = timestampToTime(this.customFormData.reportDate)
+
+        getDetailByReportId(this.updateId).then(res => {
+          this.customFormData.produceReportDetails = res.data
+        })
+        this.getPlanProductList()
+      })
+    }
   },
   onReady() {
     // 设置自定义表单校验规则，必须在节点渲染完毕后执行
@@ -168,10 +184,10 @@ export default {
       console.log(this.customFormData);
       this.$refs[ref].validate().then(res => {
         var ok = 1;
-        if(this.customFormData.productList && this.customFormData.productList.length > 0) {
-          for (let i = 0; i < this.customFormData.productList.length; i++) {
-            if(!this.customFormData.productList[i].planId || this.customFormData.productList[i].planId===''
-             || !this.customFormData.productList[i].qualityNumber|| this.customFormData.productList[i].qualityNumber <= 0) {
+        if(this.customFormData.produceReportDetails && this.customFormData.produceReportDetails.length > 0) {
+          for (let i = 0; i < this.customFormData.produceReportDetails.length; i++) {
+            if(!this.customFormData.produceReportDetails[i].planId || this.customFormData.produceReportDetails[i].planId===''
+             || !this.customFormData.produceReportDetails[i].qualityNumber|| this.customFormData.produceReportDetails[i].qualityNumber <= 0) {
               ok = 0;
               uni.showToast({
                 title: `产品信息不能为空！`,
@@ -184,10 +200,19 @@ export default {
         if(ok===1){
           showConfirm("确认保存生产报工单吗？").then(res => {
             if (res.confirm) {
-              createReport(this.customFormData).then(response => {
-                modal.msgSuccess("保存成功")
-                tab.switchTab('/pages/report')
-              })
+              if(this.updateId){
+                this.customFormData.id = this.updateId
+                update(this.customFormData).then(response => {
+                  modal.msgSuccess("修改成功")
+                  tab.navigateBack()
+                })
+              }else {
+                this.customFormData.id = null
+                createReport(this.customFormData).then(response => {
+                  modal.msgSuccess("保存成功")
+                  tab.switchTab('/pages/report')
+                })
+              }
             }
           })
         }
@@ -227,7 +252,7 @@ export default {
     },
     add() {
       if(this.customFormData.orgType){
-        this.customFormData.productList.push({
+        this.customFormData.produceReportDetails.push({
           id: Date.now(),
           productId: undefined,
           planId: undefined,
@@ -246,20 +271,20 @@ export default {
       }
     },
     del(id) {
-      let index = this.customFormData.productList.findIndex(v => v.id === id)
-      this.customFormData.productList.splice(index, 1)
+      let index = this.customFormData.produceReportDetails.findIndex(v => v.id === id)
+      this.customFormData.produceReportDetails.splice(index, 1)
     },
     changeNumber(id){
-      let index = this.customFormData.productList.findIndex(v => v.id === id)
-      if(!this.customFormData.productList[index].qualityNumber)
-        this.customFormData.productList[index].qualityNumber=0;
-      if(!this.customFormData.productList[index].wasteNumber)
-        this.customFormData.productList[index].wasteNumber=0;
+      let index = this.customFormData.produceReportDetails.findIndex(v => v.id === id)
+      if(!this.customFormData.produceReportDetails[index].qualityNumber)
+        this.customFormData.produceReportDetails[index].qualityNumber=0;
+      if(!this.customFormData.produceReportDetails[index].wasteNumber)
+        this.customFormData.produceReportDetails[index].wasteNumber=0;
 
-      this.customFormData.productList[index].totalNumber =
-          Number(this.customFormData.productList[index].qualityNumber)  + Number(this.customFormData.productList[index].wasteNumber);
-      this.customFormData.productList[index].qualityRate =
-          (Number(this.customFormData.productList[index].qualityNumber)*100/Number(this.customFormData.productList[index].totalNumber)).toFixed(2);
+      this.customFormData.produceReportDetails[index].totalNumber =
+          Number(this.customFormData.produceReportDetails[index].qualityNumber)  + Number(this.customFormData.produceReportDetails[index].wasteNumber);
+      this.customFormData.produceReportDetails[index].qualityRate =
+          (Number(this.customFormData.produceReportDetails[index].qualityNumber)*100/Number(this.customFormData.produceReportDetails[index].totalNumber)).toFixed(2);
     },
     handleOrgTypeChange(e){
       console.log(e)
diff --git a/src/pages.json b/src/pages.json
index 7d1face..6f1efcb 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -51,6 +51,12 @@
         "navigationBarTitleText": "浏览文本"
       }
     },
+    {
+      "path": "pages/template",
+      "style": {
+        "navigationBarTitleText": "模板"
+      }
+    },
     {
       "path": "pages/report",
       "style": {
@@ -69,6 +75,12 @@
             "navigationBarTitleText": "生产报工"
           }
         },
+        {
+          "path": "ViewForm",
+          "style": {
+            "navigationBarTitleText": "报工详情"
+          }
+        },
         {
           "path": "replaceForm",
           "style": {
@@ -303,6 +315,12 @@
 	    "selectedIconPath": "static/images/tabbar/work_.png",
 	    "text": "投料"
 	  },
+      {
+        "pagePath": "pages/template",
+        "iconPath": "static/images/tabbar/work.png",
+        "selectedIconPath": "static/images/tabbar/work_.png",
+        "text": "模板"
+      },
       {
         "pagePath": "pages/mine",
         "iconPath": "static/images/tabbar/mine.png",
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 6c743f9..ab87aaa 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -7,16 +7,16 @@
       <el-collapse-item v-for="(item, index) in startList"  :name="item.id">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{item.code}}</el-text>-
-          <el-text  size="large">{{item.productName}}</el-text>
+          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
+          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
         </template>
         <el-row>
+          <el-col :span="8">
+            <el-text type="success">{{item.code}}</el-text>-
+          </el-col>
           <el-col :span="12">
             <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
           </el-col>
-          <el-col :span="8">
-            <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-          </el-col>
           <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
             <el-button type="success" plain  @click="updatePlan(item.id, item.code,'end')">完工</el-button>
           </el-col>
@@ -49,16 +49,16 @@
       <el-collapse-item v-for="(item, index) in paigongList"  :name="item.id">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{item.code}}</el-text>-
-          <el-text  size="large">{{item.productName}}</el-text>
+          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
+          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
         </template>
         <el-row>
+          <el-col :span="8">
+            <el-text type="success">{{item.code}}</el-text>-
+          </el-col>
           <el-col :span="12">
             <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
           </el-col>
-          <el-col :span="8">
-            <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-          </el-col>
           <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
             <el-button type="info" plain  @click="updatePlan(item.id,item.code, 'start')">开工</el-button>
           </el-col>
@@ -77,16 +77,16 @@
       <el-collapse-item v-for="(item, index) in planList"  :name="item.id">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{item.code}}</el-text>-
-          <el-text  size="large">{{item.productName}}</el-text>
+          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
+          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
         </template>
         <el-row>
+          <el-col :span="8">
+            <el-text type="success">{{item.code}}</el-text>-
+          </el-col>
           <el-col :span="12">
             <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
           </el-col>
-          <el-col :span="8">
-            <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-          </el-col>
           <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
             <el-button type="primary" plain>派工</el-button>
           </el-col>
@@ -105,16 +105,16 @@
       <el-collapse-item v-for="(item, index) in pauseList"  :name="item.id">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{item.code}}</el-text>-
-          <el-text  size="large">{{item.productName}}</el-text>
+          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
+          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
         </template>
         <el-row>
+          <el-col :span="8">
+            <el-text type="success">{{item.code}}</el-text>-
+          </el-col>
           <el-col :span="12">
             <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
           </el-col>
-          <el-col :span="8">
-            <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-          </el-col>
           <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
             <el-button type="success" plain  @click="updatePlan(item.id,item.code, 'end')">完工</el-button>
           </el-col>
diff --git a/src/pages/login.vue b/src/pages/login.vue
index 7d4dbc7..33675b3 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -49,8 +49,8 @@ const captchaEnabled = ref(false); // 是否开启验证码
 const globalConfig = ref(config);
 const loginForm = ref({
   tenantName: '内蒙必硕',
-  username: "admin",
-  password: "admin123",
+  username: "",
+  password: "",
   captchaVerification: '',
   rememberMe: '',
   code: '',
diff --git a/src/pages/report.vue b/src/pages/report.vue
index 088aeaa..79fbe17 100644
--- a/src/pages/report.vue
+++ b/src/pages/report.vue
@@ -21,8 +21,9 @@
             <!-- 自定义 footer-->
             <template v-slot:footer>
               <el-button v-if="item.reportStatus === 0" type="primary" size="small"  :icon="Edit" circle @click="editOrAddReport(item.id)"/>
-              <el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Check" circle @click="updateReport(item.id)"/>
-              <el-button v-if="item.reportStatus < 2" type="danger" size="small" :icon="Delete" circle @click="deleteReport(item.id)"/>
+              <el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Check" circle @click="updateReport(item.id,1,'提交')"/>
+              <el-button v-if="item.reportStatus === 0" type="danger" size="small" :icon="Delete" circle @click="deleteReport(item.id)"/>
+              <el-button v-if="item.reportStatus >= 1" type="primary" size="small"  :icon="View" circle @click="handleView(item.id)"/>
             </template>
           </uni-list-item>
         </uni-list>
@@ -65,10 +66,11 @@
             </template>
             <!-- 自定义 footer-->
             <template v-slot:footer>
-              <el-button v-if="item.reportStatus === 0" type="primary" size="small"  :icon="Edit" circle @click="addReplaceReport(item.id)"/>
+              <el-button v-if="item.reportStatus < 2" type="primary" size="small"  :icon="Edit" circle @click="addReplaceReport(item.id)"/>
               <el-button v-if="item.reportStatus === 0" type="success" size="small" :icon="Promotion" circle @click="updateReport(item.id,1,'提交')"/>
               <el-button v-if="item.reportStatus === 1" type="success" size="small" :icon="Check" circle @click="updateReport(item.id,2,'通过')"/>
               <el-button v-if="item.reportStatus < 2" type="danger" size="small" :icon="Delete" circle @click="deleteReport(item.id)"/>
+
             </template>
           </uni-list-item>
         </uni-list>
@@ -130,7 +132,7 @@
 
 <script>
 import {getMyList, getOtherList, getById, updateStatus,deleteByReportId } from "@/api/mes/report";
-import {Check, Delete, Edit,Promotion,Close} from '@element-plus/icons-vue'
+import {Check, Delete, Edit,Promotion,Close,View} from '@element-plus/icons-vue'
 import tab from "@/plugins/tab";
 import modal from "@/plugins/modal";
 import auth from "@/plugins/auth";
@@ -145,10 +147,12 @@ export default {
     Promotion() {return Promotion},
     Close() {return Close},
     Edit() {return Edit},
-    Check() {return Check}
+    Check() {return Check},
+    View() {return View}
   },
   data() {
     return {
+      currentPaneName: '',
       loading: false,
       reportList: [],
       otherReportList: [],
@@ -178,7 +182,18 @@ export default {
     this.loading = false
   },
   onPullDownRefresh() {
-    console.log('refresh');
+    //请求个人报工审核数据
+    if(this.currentPaneName==='third'){
+      this.getOtherReportList()
+    }
+    //请求代报数据
+    else if(this.currentPaneName==='second'){
+      this.getReplaceReportList();
+    }
+    else {
+      //请求个人报工数据
+      this.getList();
+    }
     setTimeout(function () {
       uni.stopPullDownRefresh();
     }, 1000);
@@ -189,7 +204,7 @@ export default {
     },
     handleTabClick(tab) {
       this.loading = true
-      console.log(tab.paneName)
+      this.currentPaneName=tab.paneName
       //请求个人报工审核数据
       if(tab.paneName==='third'){
         this.getOtherReportList()
@@ -263,7 +278,7 @@ export default {
     },
     editOrAddReport(id){
       if(id===null || id===undefined)tab.navigateTo('/page_report/reportForm')
-      else tab.navigateTo("",id)
+      else tab.navigateTo('/page_report/reportForm',id)
     },
     addReplaceReport(id){
       if(id===null || id===undefined)tab.navigateTo('/page_report/replaceForm')
@@ -286,8 +301,10 @@ export default {
       //查找个人报工审核列表
       this.getReplaceReportList()
       this.loading = false
+    },
+    handleView(id){
+      tab.navigateTo('/page_report/ViewForm',id)
     }
-
   }
 };
 
diff --git a/src/pages/work.vue b/src/pages/work.vue
index b76ef61..eeacd4a 100644
--- a/src/pages/work.vue
+++ b/src/pages/work.vue
@@ -8,14 +8,12 @@
       <el-collapse-item v-for="(item, index) in finishList"  :name="item.id" @click="handleFinishClick(item.id,index)">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{timestampToTime(item.feedingTime)}}</el-text>-
-          <el-text  size="large">{{item.feedingRecordCode}}</el-text>-
-          <el-text  type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>
+          <el-text type="success">{{timestampToTime(item.feedingTime)}}</el-text>&nbsp;/&nbsp;
+          <el-text  type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>&nbsp;/&nbsp;
+          <el-text type="info">{{findTextByValue(feedingTypes, item.feedingType)  }}</el-text>
         </template>
+        <el-text  size="large">{{item.feedingRecordCode}}</el-text>
         <el-row>
-          <el-col :span="6">投料类型:
-            <el-text type="warning">{{findTextByValue(feedingTypes, item.feedingType)  }}</el-text>
-          </el-col>
           <el-col :span="8">记录人:
             <el-text type="success">{{ item.userName }}</el-text>
           </el-col>
@@ -42,14 +40,12 @@
       <el-collapse-item v-for="(item, index) in draftList"  :name="item.id"  @click="handleDraftClick(item.id,index)">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{timestampToTime(item.feedingTime)}}</el-text>-
-          <el-text  size="large">{{item.feedingRecordCode}}</el-text>-
-          <el-text  type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>
+          <el-text type="success">{{timestampToTime(item.feedingTime)}}</el-text>&nbsp;/&nbsp;
+          <el-text  type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>&nbsp;/&nbsp;
+          <el-text type="info">{{findTextByValue(feedingTypes, item.feedingType)  }}</el-text>
         </template>
+        <el-text  size="large">{{item.feedingRecordCode}}</el-text>
         <el-row>
-          <el-col :span="6">投料类型:
-            <el-text type="warning">{{findTextByValue(feedingTypes, item.feedingType)  }}</el-text>
-          </el-col>
           <el-col :span="8">记录人:
             <el-text type="success">{{ item.userName }}</el-text>
           </el-col>
@@ -76,7 +72,7 @@
         </el-row>
       </el-collapse-item>
     </el-collapse>
-    <uni-fab  ref="fab" :pattern="pattern" @fabClick="handleAdd" />
+    <uni-fab v-if="auth.hasPermi('mes:feeding-record:create')"  ref="fab" :pattern="pattern" @fabClick="handleAdd" />
   </view>
 </template>
 
@@ -89,7 +85,7 @@ 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([]);