From 24cc28bb458f16af7aef99b1f9c3115996a2a3fa Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 12 四月 2024 16:23:50 +0800
Subject: [PATCH] 开始回数和结束回数不显示的问题修改

---
 src/views/productManage/productRegisterForm/addProductRegisterPage.vue |   76 ++++++++++++++++++++++++--------------
 1 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index ca339fe..d5ecb79 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -213,17 +213,24 @@
                         label=""
                         @input="inputStart"
                         label-width="0"
+                        label-position="right"
                         prop="fallingSilkBucketOne"
+                        :rules="[
+                          {
+                            required: ruleForm.selectOne,
+                            message: '璇峰~鍐�',
+                            trigger: 'change',
+                          },
+                        ]"
                         class='margin_right_10px select-width-input'
                       >
                         <el-input
                           v-model="ruleForm.fallingSilkBucketOne"
                           size="small"
-                          class="d-b-c-input"
                         ></el-input>
                       </el-form-item>
                       <el-checkbox
-                        v-model="ruleForm.isfallingSilkBucketOne"
+                        v-model="ruleForm.selectOne"
                       ></el-checkbox>
                     </div>
                     <div class="select-width">
@@ -231,6 +238,13 @@
                         label=""
                         @input="inputStart"
                         label-width="0"
+                        :rules="[
+                          {
+                            required: ruleForm.selectTwo,
+                            message: '璇峰~鍐�',
+                            trigger: 'change',
+                          },
+                        ]"
                         prop="fallingSilkBucketTwo"
                         class='margin_right_10px select-width-input'
                       >
@@ -241,14 +255,21 @@
                         ></el-input>
                       </el-form-item>
                       <el-checkbox
-                        v-model="ruleForm.isfallingSilkBucketTwo"
+                        v-model="ruleForm.selectTwo"
                       ></el-checkbox>
                     </div>
                     <div class="select-width">
                       <el-form-item
                         label=""
                         @input="inputStart"
-                        label-width="0"
+                        label-width=""
+                        :rules="[
+                          {
+                            required: ruleForm.selectThree,
+                            message: '璇峰~鍐�',
+                            trigger: 'change',
+                          },
+                        ]"
                         prop="fallingSilkBucketThree"
                         class='margin_right_10px select-width-input'
                       >
@@ -259,7 +280,7 @@
                         ></el-input>
                       </el-form-item>
                       <el-checkbox
-                        v-model="ruleForm.isfallingSilkBucketThree"
+                        v-model="ruleForm.selectThree"
                       ></el-checkbox>
                     </div>
                   </div>
@@ -630,11 +651,11 @@
         groupReelingdiscount: "",
         fallingSilkBucket: "",
         fallingSilkBucketOne: "",
-        isfallingSilkBucketOne: "",
+        selectOne: false,
         fallingSilkBucketTwo: "",
-        isfallingSilkBucketTwo: "",
+        selectTwo: false,
         fallingSilkBucketThree: "",
-        isfallingSilkBucketThree: "",
+        selectThree: false,
         back: "",
         oneBack: "",
         twoBack: "",
@@ -701,11 +722,11 @@
         groupReelingdiscount: "",
         fallingSilkBucket: "",
         fallingSilkBucketOne: "",
-        isfallingSilkBucketOne: "",
+        selectOne: false,
         fallingSilkBucketTwo: "",
-        isfallingSilkBucketTwo: "",
+        selectTwo: false,
         fallingSilkBucketThree: "",
-        isfallingSilkBucketThree: "",
+        selectThree: false,
         back: "",
         oneBack: "",
         twoBack: "",
@@ -759,18 +780,19 @@
             if(this.tableDataCircles[j].carNumber==this.tableData[i].carNumber){
               let circle=this.tableDataCircles[j].circle
               let pieceNumberList=this.tableDataCircles[j].pieceNumbers||[]
-              this.tableData[i]['allYield'+circle]=this.tableDataCircles[j]['allYield'+circle]
-              this.tableData[i]['oneYield'+circle]=this.tableDataCircles[j]['oneYield'+circle]
-              this.tableData[i]['reelingdiscount'+circle]=this.tableDataCircles[j]['reelingdiscount'+circle]
+              this.tableData[i]['allYield'+circle]=this.tableDataCircles[j]['allYield']
+              this.tableData[i]['oneYield'+circle]=this.tableDataCircles[j]['oneYield']
+              this.tableData[i]['reelingdiscount'+circle]=this.tableDataCircles[j]['reelingdiscount']
               if(pieceNumberList.length>0){
                 for(let k in pieceNumberList){
-                  this.tableData[i]['pieceNumber'+circle+pieceNumberList[k].pieceNumber]
+                  this.tableData[i]['pieceNumber'+circle+pieceNumberList[k].pieceNumber]=pieceNumberList[k].value
                 }
               }
             }
           }
         }
       }
+      console.log(this.tableData,'==this.tableData')
       this.ruleForm.carNumber=this.tableData.length>0?this.tableData[0].carNumber:''
     },
     // 琛ㄦ牸鐨勮绠楅棶棰�
@@ -907,6 +929,11 @@
             })
             this.$set(this.tableData[i],'isBlue',true)
             this.$set(this.tableData[i],'pieceNumber'+form.pieceNumber+form.pieces,form.netWeight)
+            this.tableShow=false;
+            this.$nextTick(()=>{
+              this.tableShow=true;
+              this.$forceUpdate();
+            })
             break;
           }
         }
@@ -1064,11 +1091,11 @@
         groupReelingdiscount: "",
         fallingSilkBucket: "",
         fallingSilkBucketOne: "",
-        isfallingSilkBucketOne: "",
+        selectOne: false,
         fallingSilkBucketTwo: "",
-        isfallingSilkBucketTwo: "",
+        selectTwo: false,
         fallingSilkBucketThree: "",
-        isfallingSilkBucketThree: "",
+        selectThree:false,
         back: "",
         oneBack: "",
         twoBack: "",
@@ -1107,10 +1134,6 @@
           form.total=Number(form.total)
           form.vehicleSpeed=Number(form.vehicleSpeed)
           form.workshopId	=Number(form.workshopId)
-          delete form.isfallingSilkBucketOne
-          delete form.isfallingSilkBucketThree
-          delete form.isfallingSilkBucketTwo
-          debugger
           for(let i in tableData){
             let listItems1={
               allYield:Number(tableData[i].allYield1)||0, //浜ч噺
@@ -1207,7 +1230,6 @@
             circles.push(listItems3)
             items.push(listItems4)
           }
-          console.log(circles,'circles')
           let params = {
             ...form,
             circles: circles,
@@ -1285,7 +1307,8 @@
     .select-width {
       width: calc(100%  - 20px);
       .select-width-input{
-        width:calc(100% - 200px);float:left;
+        width:150px;
+        float:left;
       }
     }
     .body-top {
@@ -1356,7 +1379,4 @@
 .c-n {
   cursor: no-drop;
 }
-
-::v-deep {
-}
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.8.0