1

src/views/production/shipment/print-order/unpack.vue

@@ -77,65 +77,31 @@
         <div
           style="max-height: calc(100vh - 190px); overflow-x: hidden; overflow-y: auto"
           v-if="formData.data.orderEncasementList && formData.data.orderEncasementList.length > 0">
-          <!-- <div class="packing" v-for="(item, index) in formData.data.orderEncasementList" :key="index">
-            <div class="top">
-              <div class="item">
-                <div>单包裹规格格（cm）</div>
-                <div class="red">{{ `${item.length}*${item.width}*${item.height}` }}</div>
-              </div>
-              <div class="item">
-                <div>单包裹净重（kg）</div>
-                <div class="red">{{ item.netWeight }}</div>
-              </div>
-              <div class="item">
-                <div>单包裹体积（m³）</div>
-                <div class="red">{{ item.bulking }}</div>
-              </div>
-              <div class="item">
-                <div>总包裹数</div>
-                <div class="red">{{ item.total }}</div>
-              </div>
-              <div class="item">
-                <div>总净重（kg）</div>
-                <div class="red">{{ item.netWeight }}</div>
-              </div>
-              <div class="item">
-                <div>总体积（m³）</div>
-                <div class="red">{{ item.bulkingTotal }}</div>
-              </div>
-              <div class="item" style="text-align: center">
-                <div>操作</div>
-                <div class="miniBtn">
-                  <el-button type="text" size="mini" @click="copyBox(item.id)">复制包裹</el-button>
-                  <el-button type="text" size="mini" style="color: #f56c6c" @click="handleDel(item.id)">删除</el-button>
-                </div>
-              </div>
+          <div style="box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1); margin-bottom: 20px" v-for="(item, index) in formData.data.orderEncasementList" :key="index">
+            <div style="background-color: #edf0f5; padding: 4px">
+              <el-row :gutter="4" class="row-top">
+                <el-col :span="5">单包裹规格格（cm）</el-col>
+                <el-col :span="4">单包裹净重（kg）</el-col>
+                <el-col :span="4">单包裹体积（m³）</el-col>
+                <el-col :span="2">总包裹数</el-col>
+                <el-col :span="3">总净重（kg）</el-col>
+                <el-col :span="3">总体积（m³）</el-col>
+                <el-col :span="3">操作</el-col>
+              </el-row>
+              <el-row :gutter="4" class="row-bottom">
+                <el-col :span="5">{{ `${item.length}*${item.width}*${item.height}` }}</el-col>
+                <el-col :span="4">{{ item.netWeight / 1000 }}</el-col>
+                <el-col :span="4">单包裹体积（m³）</el-col>
+                <el-col :span="2">{{ item.total }}</el-col>
+                <el-col :span="3">总净重（kg）</el-col>
+                <el-col :span="3">总体积（m³）</el-col>
+                <el-col :span="3">
+                  <el-button type="primary" @click="copyBox(item.id)" text>复制包裹</el-button>
+                  <el-button type="danger" @click="handleDel(item.id)" text>删除</el-button>
+                </el-col>
+              </el-row>
             </div>
-            <div class="mail-1">
-              <el-table
-                border
-                :data="item.expressPackingProductList"
-                size="small"
-                :row-style="{ height: '35px' }"
-                :cell-style="{ padding: '0' }"
-                :span-method="arraySpanMethod">
-                <el-table-column label="产品品号" prop="productColorCode" align="left" width="150" />
-                <el-table-column label="产品品名" prop="productColorName" align="left" />
-                <el-table-column label="打包数量" prop="quantity" align="left" width="90">
-                  <template slot-scope="scope">
-                    <div>
-                      {{ scope.row.quantity ? scope.row.quantity : 0 }}
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column label="总包裹数" align="center" width="80">
-                  <template>
-                    <div>x {{ item.total }}</div>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </div> -->
+          </div>
         </div>
       </el-card>
     </el-col>
@@ -178,9 +144,6 @@ const getDetails = () => {
     }
   );
 };
-const sum = (arr) => {
-  return arr.reduce((prev, curr) => prev + curr);
-};
 const submitPack = () => {
   proxy.$refs.refForm.validate((valid) => {
     if (valid) {
@@ -196,7 +159,7 @@ const submitPack = () => {
           width: formData.data.width,
           height: formData.data.height,
           orderEncasementDetailList: list,
-          total: sum(list.map((item) => Number(item.quantity))),
+          total: 1,
         })
         .then(
           () => {
@@ -217,30 +180,19 @@ const submitPack = () => {
 ::v-deep(.el-input-number .el-input__inner) {
   text-align: left;
 }
-.packing {
-  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1);
-  margin-bottom: 20px;
-  .top {
-    background-color: #edf0f5;
-    height: 50px;
-    display: flex;
-    justify-content: space-between;
-    .item {
-      text-align: center;
-      padding: 0 5px;
-      display: flex;
-      height: 50px;
-      flex-direction: column;
-      justify-content: space-around;
-      .red {
-        color: red;
-        font-weight: 700;
-      }
-    }
-  }
-  .main-1 {
-    padding: 20px 5vw;
-    margin: 0 auto;
+.row-top .el-col {
+  text-align: center;
+  height: 32px;
+  line-height: 32px;
+}
+.row-bottom {
+  margin-top: 10px;
+  .el-col {
+    text-align: center;
+    color: red;
+    font-weight: 700;
+    height: 32px;
+    line-height: 32px;
   }
 }
 </style>