报工详情增加领料记录，重量解决精准度

src/views/produce/components/jobBooking/components/jobBom.vue

@@ -160,6 +160,14 @@ export default {
         this.notFormedList = newVal;
       }
     },
+     item: {
+      immediate: true,
+      deep: true,
+      handler(newVal) {
+        let weightValue=parseFloat((newVal.workReportInfo.formedWeight).toFixed(2))
+        this.$set(this.item.workReportInfo,'formedWeight',weightValue)
+      }
+    },
   },
 
   computed: {

src/views/produce/components/jobBooking/components/jobDdBom.vue

@@ -175,13 +175,16 @@ export default {
 
                     newVal.workReportInfo.formedNum = formedNum;
                     newVal.workReportInfo.notFormedNum = noFormingNum;
-                    newVal.workReportInfo.formedWeight = parseFloat(formedWeight.toFixed(3))
-                    newVal.workReportInfo.notFormedWeight = parseFloat(notFormedWeight.toFixed(3))
+                    newVal.workReportInfo.formedWeight = parseFloat(formedWeight.toFixed(2))
+                    this.$set(this.item.workReportInfo,'formedWeight',formedWeight.toFixed(2))
+                    newVal.workReportInfo.notFormedWeight = parseFloat(notFormedWeight.toFixed(2))
+                     this.$set(this.item.workReportInfo,'notFormedWeight',notFormedWeight.toFixed(2))
                     this.$forceUpdate()
                    
 
 
                 }
+                
             }
         },
 

src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -468,8 +468,8 @@ export default {
         this.$set(this.list[i].extInfo,'reportWeight',s.extInfo.reportWeight)
       })
       
-      this.item.workReportInfo.formedWeight = formedWeight;
-      this.item.workReportInfo.notFormedWeight = noFormedWeight;
+      this.item.workReportInfo.formedWeight = parseFloat((formedWeight).toFixed(2));
+      this.item.workReportInfo.notFormedWeight = parseFloat((noFormedWeight).toFixed(2));
     },
 
 

src/views/produce/components/picking/details.vue

@@ -12,7 +12,7 @@
       @refresh="refresh"
     >
       <template v-slot:toolbar>
-      <div class="rx-sc">
+      <div class="rx-sc" v-if="!isDetails">
         <div class="c_title">领料记录 </div>
         <el-button type="primary" size="mini" style="margin: 0 5px" @click="handleAdd">新增</el-button>
       </div>
@@ -28,6 +28,7 @@
         <el-tag
             :type="['danger', 'success', 'warning', 'danger'][row.status] "
             effect="dark"
+            style="margin: 3px 0;"
             >{{
             statusList[row.status]
             }}</el-tag
@@ -47,9 +48,16 @@
 <script>
   import { pickDetails } from '@/api/produce/picking';
   import detailed from './detailed.vue';
+import { boolean } from 'mathjs';
   export default {
     name: 'picking-details',
     components: { detailed },
+    props:{
+      isDetails:{
+        type: Boolean,
+        default: false
+      }
+    },
     data() {
       return {
         dataList: [],

src/views/produce/components/produceOrder.vue

@@ -44,7 +44,7 @@
       </template>
 
       <template v-slot:formingWeight="{ row }">
-        <span> {{ row.formingNum }} {{ row.weightUnit }} </span>
+        <span> {{ row.formingWeight }} {{ row.weightUnit }} </span>
       </template>
     </ele-pro-table>
 

src/views/produce/components/routings.vue

@@ -25,6 +25,14 @@
           ></el-step>
         </el-steps>
         <el-tabs type="border-card">
+          <el-tab-pane label="领料记录" >
+            <!-- <feedDetails
+              v-if="newId!=='-1'"
+              :routeObj="routeObj"
+              :curTaskObj="curTaskObj"
+            ></feedDetails> -->
+            <pickDetails ref="pickListRef" :isDetails="true"></pickDetails>
+          </el-tab-pane>
           <el-tab-pane label="投料详情" >
             <feedDetails
               v-if="newId!=='-1'"
@@ -48,10 +56,12 @@
   import { getTaskInstanceList } from '@/api/produce/job';
   import feedDetails from '../components/feeding/details.vue';
   import jobDetails from '../components/jobBooking/details.vue';
+  import pickDetails from '../components/picking/details.vue';
   export default {
     components: {
       feedDetails,
-      jobDetails
+      jobDetails,
+      pickDetails
     },
     props: {
       routeObj: {
@@ -99,6 +109,7 @@
           }
 
           this.activeIndex = index;
+          this.$refs.pickListRef.getList([this.routeObj.id]);
         });
       },
 
@@ -108,13 +119,13 @@
       },
 
       handIdx(index, item) {
-        
         this.curTaskObj = JSON.parse(JSON.stringify(item));
         if (item.taskId == -2) {
           this.$message.info('完结状态不能点击');
         } else {
           this.desIndex = index;
           this.newId = this.curTaskObj.taskId;
+          this.$refs.pickListRef.getList([this.routeObj.id]);
         }
       }
     },

src/views/produce/index.vue

@@ -393,7 +393,7 @@ export default {
         this.$store.state.user.taskObj.constructor === Object
       ) {
         this.$message.warning('请选择工序');
-        return false;
+        return true;
       }
       if (['pick', 'feed', 'job'].includes(t)) {
         if (this.workListIds.length == 0) {