From bc06fc0e98ed22b45638d5c2c9635283837104fd Mon Sep 17 00:00:00 2001
From: chenwei <chenwei@cqprow.com>
Date: 星期一, 07 六月 2021 09:51:05 +0800
Subject: [PATCH] no message

---
 src/components/agopage/comment/InfoDialog.vue |   21 +++++++++++++--------
 src/components/agopage/comment/BoxType.vue    |   36 +++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/components/agopage/comment/BoxType.vue b/src/components/agopage/comment/BoxType.vue
index f656dfa..ae37af0 100644
--- a/src/components/agopage/comment/BoxType.vue
+++ b/src/components/agopage/comment/BoxType.vue
@@ -78,7 +78,8 @@
                   :disabled="item.isNumDisable"
                 ></el-input-number>
               </div>
-              <div class="number" v-else>
+
+              <div class="number" v-if="item.tempOrder.TempOrderContainer.length != 0">
                 <el-input-number
                   v-model="item.tempOrder.ContainerNub"
                   @change="handleChange($event, item)"
@@ -88,8 +89,35 @@
                   :disabled="true"
                 ></el-input-number>
               </div>
+              <!-- 鍙屾墭鐨勬暟閲�(杞�) -->
+                <!-- <div
+                class="number"
+                v-if="item.tempOrder.TempOrderContainer.length == 0&&item.tempOrder.Container.CntrType==3"
+              >
+                <el-input-number
+                  v-model="item.tempOrder.ContainerNub"
+                  @change="handleChange($event, item)"
+                  :min="1"
+                  :max="10"
+                  label="鏁伴噺"
+                  :disabled="item.isNumDisable"
+                ></el-input-number>
+              </div>
+
+            <div class="number" v-if="item.tempOrder.TempOrderContainer.length != 0">
+                <el-input-number
+                  v-model="item.tempOrder.Container.CnterNub"
+                  @change="handleChange($event, item)"
+                  :min="1"
+                  :max="10"
+                  label="鏁伴噺"
+                  :disabled="true"
+                ></el-input-number>
+              </div> -->
+
+           
               <div class="box-count" style="width: 33px; text-align: center">
-                {{ item.tempOrder.ContainerNub }}
+                {{ item.tempOrder.ContainerNub*item.tempOrder.Container.CnterNub }}
               </div>
               <div
                 style="text-align: center; color: #d9001b; width: 50px"
@@ -642,6 +670,7 @@
             ContainerOwner: e.ContainerOwner,
             ContainerNo: e.moreBox[i].ContainerNo,
             BoxSeal: e.moreBox[i].BoxSeal,
+            Weight:e.moreBox[i].Weight
           });
         }
       } else {
@@ -652,10 +681,11 @@
           ContainerOwner: e.ContainerOwner,
           ContainerNo: e.moreBox[0].ContainerNo,
           BoxSeal: e.moreBox[0].BoxSeal,
+           Weight: e.moreBox[0].Weight
         });
       }
       this.getSingeTemp({ TempOrderID: e.id, TempOrderContainer: arr });
-      // 缁欑鍙峰鍒惰繘琛屽睍绀�
+      // 缁欑鍙疯祴鍊艰繘琛屽睍绀�
       this.tempOrderForms[e.index].TempOrderContainer[0].ContainerNo =
         e.moreBox[0].ContainerNo;
       //绂佺敤鏁伴噺
diff --git a/src/components/agopage/comment/InfoDialog.vue b/src/components/agopage/comment/InfoDialog.vue
index 0b54552..71780a0 100644
--- a/src/components/agopage/comment/InfoDialog.vue
+++ b/src/components/agopage/comment/InfoDialog.vue
@@ -54,7 +54,7 @@
         </el-form-item>
         <el-form-item
           label="閲嶉噺"
-          :prop="'moreBox.' + index + '.BoxSeal'"
+          :prop="'moreBox.' + index + '.Weight'"
           :rules="{
             required: true,
             message: '璇峰~鍐欓噸閲�',
@@ -62,7 +62,7 @@
           }"
         >
           <el-input
-            v-model="item.BoxSeal"
+            v-model="item.Weight"
             type="number"
             placeholder="璇疯緭鍏ユ暟瀛�"
           ></el-input>
@@ -125,30 +125,34 @@
             console.log("澶氫釜绠卞瓙");
             this.ruleForm.moreBox = [];
             for (var i = 0; i < val.TempOrderContainer.length; i++) {
-              this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" });
+              this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" ,Weight:""});
             }
             for (var j = 0; j < this.ruleForm.moreBox.length; j++) {
               this.ruleForm.moreBox[j].ContainerNo =
                 val.TempOrderContainer[j].ContainerNo;
               this.ruleForm.moreBox[j].BoxSeal =
                 val.TempOrderContainer[j].BoxSeal;
+                 this.ruleForm.moreBox[j].Weight =
+                val.TempOrderContainer[j].Weight;
             }
           } else {
             console.log("鍗曚釜绠卞瓙");
-            this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "" }];
+            this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "",Weight:"" }];
             this.ruleForm.moreBox[0].ContainerNo =
               val.TempOrderContainer[0].ContainerNo;
             this.ruleForm.moreBox[0].BoxSeal =
               val.TempOrderContainer[0].BoxSeal;
+              his.ruleForm.moreBox[0].Weight =
+              val.TempOrderContainer[0].Weight;
           }
           console.log(this.ruleForm);
         } else {
-          if (val.ContainerNub == 1) {
-            this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "" }];
+          if ((val.ContainerNub)*(val.Container.CnterNub) == 1) {
+            this.ruleForm.moreBox = [{ ContainerNo: "", BoxSeal: "",Weight:""  }];
           } else {
             this.ruleForm.moreBox = [];
-            for (var i = 0; i < val.ContainerNub; i++) {
-              this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "" });
+            for (var i = 0; i < (val.ContainerNub)*(val.Container.CnterNub); i++) {
+              this.ruleForm.moreBox.push({ ContainerNo: "", BoxSeal: "",Weight:""  });
             }
           }
         }
@@ -218,6 +222,7 @@
             .then(() => {
               this.ruleForm.id = this.temId;
               this.$emit("info", this.ruleForm);
+              
             })
             .catch(() => {});
           console.log(this.ruleForm);

--
Gitblit v1.9.1