From 7a12b9828af6d24bb304f67c4b417c800636836a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 1 Jan 2025 16:50:35 +0800
Subject: [PATCH] md

---
 .../WarehouseInBatchPanel.vue                 | 32 +++++----
 .../emisWarehouseInBatch/WarehouseStockIn.vue | 10 +--
 .../emisWarehouseInBatch/WsInBatchList.vue    | 70 +++++++++++--------
 3 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/src/views/emis/emisWarehouseInBatch/WarehouseInBatchPanel.vue b/src/views/emis/emisWarehouseInBatch/WarehouseInBatchPanel.vue
index ca064cbf..ec6382b8 100644
--- a/src/views/emis/emisWarehouseInBatch/WarehouseInBatchPanel.vue
+++ b/src/views/emis/emisWarehouseInBatch/WarehouseInBatchPanel.vue
@@ -13,19 +13,9 @@
            <!-- -->
         </el-descriptions-item>
         <el-descriptions-item label="客户名称">{{ whsInInfo.customerName }}</el-descriptions-item>
-        <el-descriptions-item label="预约进仓日期"><span style="font-weight: bold;color: red;">{{ whsInInfo.waybillDetail.pickStartDate }}</span></el-descriptions-item>
-        <el-descriptions-item label="进仓状态">
-          <el-tag v-if="whsInInfo.stockInFlag=='0'" type="info">未入仓</el-tag>
-                <el-tag v-if="whsInInfo.stockInFlag=='1'" type="success">已入仓</el-tag>
-                <el-tag v-if="whsInInfo.stockInFlag=='2'" type="warning">部分入仓</el-tag>
-        </el-descriptions-item>
-        <el-descriptions-item label="确认状态">
-          <el-tag v-if="whsInInfo.confirmStatus=='0'" type="info">未确认</el-tag>
-                <el-tag v-if="whsInInfo.confirmStatus=='1'" type="success">已确认</el-tag>
-                <el-tag v-if="whsInInfo.confirmStatus=='2'" type="warning">部分确认</el-tag>
-        </el-descriptions-item>
-        <el-descriptions-item label="确认时间">{{ whsInInfo.confirmDate }}</el-descriptions-item>
-        <el-descriptions-item label="仓库信息">
+        <el-descriptions-item label="预约进仓日期" :span="4"><span style="font-weight: bold;color: red;">{{ whsInInfo.waybillDetail.pickStartDate }}</span></el-descriptions-item>
+
+        <el-descriptions-item label="仓库信息"  :span="4">
             <div>
               仓库名：<span>{{ whsInInfo.waybillDetail.intoWarehouseName }}</span>
             </div>
@@ -35,8 +25,22 @@
             <div>
               地址:{{ whsInInfo.waybillDetail.intoWarehouseAddress }}
             </div>
-
         </el-descriptions-item>
+        <el-descriptions-item label="进仓状态">
+          <el-tag v-if="whsInInfo.stockInFlag=='0'" type="info">未入仓</el-tag>
+                <el-tag v-if="whsInInfo.stockInFlag=='1'" type="success">已入仓</el-tag>
+                <el-tag v-if="whsInInfo.stockInFlag=='2'" type="warning">部分入仓</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="入仓总件数">{{ whsInInfo.totalParcelQty }}</el-descriptions-item>
+        <el-descriptions-item label="入仓总重量">{{ whsInInfo.totalWeight }}kg</el-descriptions-item>
+        <el-descriptions-item label="入仓总体积">{{ whsInInfo.totalVolume }}m³</el-descriptions-item>
+
+        <el-descriptions-item label="确认状态">
+          <el-tag v-if="whsInInfo.confirmStatus=='0'" type="info">未确认</el-tag>
+                <el-tag v-if="whsInInfo.confirmStatus=='1'" type="success">已确认</el-tag>
+                <el-tag v-if="whsInInfo.confirmStatus=='2'" type="warning">部分确认</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="确认时间">{{ whsInInfo.confirmDate }}</el-descriptions-item>
       </el-descriptions>
       <el-button
                   type="primary"
diff --git a/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue b/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
index a716c476..07cab7f7 100644
--- a/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
+++ b/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
@@ -178,22 +178,24 @@
                           <el-input v-model="form.parcelQty" style="text-align: right;" placeholder=""  />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
+                    <el-col :span="4">
                         <el-form-item  :label="$t('总重量')"  prop="billWeight" label-width="70px">
-                          <el-input v-model="form.billWeight"   style="text-align: right;min-width: 80px" placeholder="" >
+                          <el-input v-model="form.billWeight"   style="text-align: right;" placeholder="" >
                             <span slot="suffix">(kg)</span>
                           </el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
+                    <el-col :span="16"></el-col>
+                    <el-col :span="4">
                         <el-form-item  :label="$t('总体积')"  prop="totalVolume" label-width="70px" >
                           <div style="">
-                            <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积" >
+                            <el-input v-model="form.totalVolume"  style="text-align: right;" placeholder="体积" >
                               <span slot="suffix">(m³)</span>
                             </el-input>
                           </div>
                         </el-form-item>
                       </el-col>
+                      <el-col :span="20"></el-col>
 
                       <!-- <el-col :span="6">
                         <el-form-item  :label="$t('包装类型')"  prop="packType" label-width="70px">
diff --git a/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue b/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
index e700f3ab..d64d2f05 100644
--- a/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
+++ b/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
@@ -21,10 +21,46 @@
                                     体积：{{ item.totalVolume }}(m³)
                               </el-col>
                         </el-row>
-                      </div>
+                </div>
+
+                <div style="margin-top:10px">
+                    <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
+                      <el-col :span="5">
+                          快递公司: <dict-tag :options="dict.type.emis_express_code" :value="item.prepareInExpress"/>
+                        </el-col>
+                        <el-col :span="5">
+                          快递单号:{{ item.prepareInBillCode }}
+                        </el-col>
+                        <el-col :span="6">
+                          是否代垫运费:
+                          <span v-if="item.blPrepareInFreight==1">是</span>
+                          <span v-else>否</span>
+
+                        </el-col>
+                        <el-col :span="5" v-if="item.blPrepareInFreight==1">
+                          代垫运费:{{ item.prepareInEstFee }} 元
+                        </el-col>
+                        <el-col :span="5">
+                          自定义标识:{{item.prepareInRemark  }}
+
+                        </el-col>
+
+
+                      </el-row>
+                  </div>
+
                 <div >
 
                       <el-table
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
                               border
                               stripe
                               :data="item.cargoList"
@@ -37,7 +73,7 @@
                                         <span > {{scope.$index+1}}</span>
                                     </template>
                               </el-table-column>
-                              <el-table-column prop="goodsName" label="品名" align="center" width="120" :show-overflow-tooltip="true">
+                              <el-table-column prop="goodsName" label="品名" align="center" min-width="120" :show-overflow-tooltip="true">
                                 <template slot-scope="scope">
                                   <span > {{scope.row.goodsName}}</span>
                                 </template>
@@ -94,7 +130,7 @@
                                   <span > {{scope.row.ingredients}}</span>
                                 </template>
                               </el-table-column>
-                              <el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
+                              <el-table-column prop="supplier" label="供应商" align="center" min-width="80" :show-overflow-tooltip="true">
                                 <template slot-scope="scope">
                                   <span > {{scope.row.supplier}}</span>
                                 </template>
@@ -103,33 +139,9 @@
                       </el-table>
 
                   </div>
-                  <div style="margin-top:10px">
-                    <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
-                      <el-col :span="5">
-                          快递公司: <dict-tag :options="dict.type.emis_express_code" :value="item.prepareInExpress"/>
-                        </el-col>
-                        <el-col :span="5">
-                          快递单号:{{ item.prepareInBillCode }}
-                        </el-col>
-                        <el-col :span="6">
-                          是否代垫运费:
-                          <span v-if="item.blPrepareInFreight==1">是</span>
-                          <span v-else>否</span>
 
-                        </el-col>
-                        <el-col :span="5" v-if="item.blPrepareInFreight==1">
-                          代垫运费:{{ item.prepareInEstFee }} 元
-                        </el-col>
-                        <el-col :span="5">
-                          自定义标识:{{item.prepareInRemark  }}
-
-                        </el-col>
-
-
-                      </el-row>
-                  </div>
-                  <div style="margin-top:20px">
-                        <div>进仓图片：</div>
+                  <div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
+                        <!-- <div>进仓图片：</div> -->
                         <div v-if="item.picUrl" style="display:inline-flex">
                           <div >
                             <ImagePreview height="40px" v-for="(pic,index2) in (item.picUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>