From b68ec574a1bd7893f9caa106468c1f7d8ca1a19a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 20:13:13 +0800
Subject: [PATCH] md

---
 .../arrivalAndDispathScan.vue                 |   3 +
 .../emis/emisTmsScanRecord/arrivalScan.vue    |   3 +
 .../clearanceScanUnderDevelopment.vue         |   3 +
 .../emisTmsScanRecord/coPackageScanning.vue   |   3 +
 .../customsClearanceScanning.vue              |   3 +
 .../emis/emisTmsScanRecord/deliveryScan.vue   |   3 +
 .../emis/emisTmsScanRecord/loadingScan.vue    |   3 +
 .../emis/emisTmsScanRecord/outgoingScan.vue   |   3 +
 .../emisTmsScanRecord/positionScanning.vue    |   3 +
 .../emis/emisTmsScanRecord/scanRecord.vue     |   3 +
 .../emis/emisTmsScanRecord/signAndRecord.vue  |   3 +
 .../transmitReceiveScanning.vue               |   3 +
 .../emis/emisTmsScanRecord/unloadingScan.vue  |   3 +
 .../emis/emisTmsScanRecord/unpackScan.vue     |   3 +
 .../emisTmsSiteBatch/emisTmsSiteBatchForm.vue | 276 +++++++++---------
 src/views/emis/emisTmsSiteBatch/index.vue     |   2 +-
 .../centralProblemInquiry.vue                 |  12 +-
 .../emisWaybillProblemInfo/problemEntry.vue   | 222 ++++++--------
 .../receivedProblemInquiries.vue              |  13 +-
 .../registrationProblemInquiry.vue            |  12 +-
 .../emisWaybillTransfer/waybillTransfer.vue   |  24 +-
 21 files changed, 265 insertions(+), 338 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
index 6dbb56d1..7e3a2c54 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
@@ -109,6 +109,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
index 88a9ef7c..93ba8e91 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
@@ -108,6 +108,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue b/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
index 2dc94183..0d425468 100644
--- a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
+++ b/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
@@ -109,6 +109,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
index e379967e..350639cd 100644
--- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
@@ -114,6 +114,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue b/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
index a80fd755..93d41d6e 100644
--- a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
@@ -109,6 +109,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
index c65671fc..7b64d958 100644
--- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue
+++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
@@ -101,6 +101,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/loadingScan.vue b/src/views/emis/emisTmsScanRecord/loadingScan.vue
index 0a1929ee..d2e53afa 100644
--- a/src/views/emis/emisTmsScanRecord/loadingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/loadingScan.vue
@@ -106,6 +106,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index e9bb44c0..7df0a966 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -109,6 +109,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue
index 5fead701..2675240e 100644
--- a/src/views/emis/emisTmsScanRecord/positionScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue
@@ -112,6 +112,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index dd89d452..c76377d8 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -108,6 +108,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
index c2b93426..dcaa748f 100644
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@@ -186,6 +186,9 @@
             <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+            <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+        </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index 2aa4f5c7..1a37264e 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -159,6 +159,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
index 3565dc71..14f57156 100644
--- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
@@ -102,6 +102,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue
index d694f4a0..516b3d44 100644
--- a/src/views/emis/emisTmsScanRecord/unpackScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue
@@ -100,6 +100,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
diff --git a/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue b/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue
index a2469b54..56276977 100644
--- a/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue
@@ -1,152 +1,135 @@
 <template>
   <div >
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-          <el-col :span="8">
-            <el-form-item label="批次号" prop="batchNo">
-              <el-input v-model="form.batchNo" placeholder="请输入批次号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="批次名称" prop="batchName">
-              <el-input v-model="form.batchName" placeholder="请输入批次名称" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="8">
-            <el-form-item label="批次时间" prop="batchDate">
-              <el-date-picker clearable
-                v-model="form.batchDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择批次时间">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="8">
-            <el-form-item label="批次类型" prop="batchType">
-              <el-input v-model="form.batchType" placeholder="请输入批次类型" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="运输方式:" prop="transType">
-              <el-input v-model="form.transType" placeholder="请输入运输方式:" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="起始网点" prop="startSiteCode">
-              <el-input v-model="form.startSiteCode" placeholder="请输入起始网点" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="航空单号" prop="airBilllNo">
-              <el-input v-model="form.airBilllNo" placeholder="请输入航空单号" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="8">
-            <el-form-item label="预计出发时间" prop="etd">
-              <el-date-picker clearable
-                v-model="form.etd"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择预计出发时间">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-        <el-col :span="8">
-            <el-form-item label="预计到达时间" prop="eta">
-              <el-date-picker clearable
-                v-model="form.eta"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择预计到达时间">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="8">
-            <el-form-item label="包数" prop="packNum">
-              <el-input v-model="form.packNum" placeholder="请输入包数" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="车牌号" prop="carNo">
-              <el-input v-model="form.carNo" placeholder="请输入车牌号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="船次号" prop="shipNo">
-              <el-input v-model="form.shipNo" placeholder="请输入船次号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="清关资料状态" prop="clearanceResStatus">
-              <el-input v-model="form.clearanceResStatus" placeholder="请输入清关资料状态" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="报关资料状态" prop="declareResStatus">
-              <el-input v-model="form.declareResStatus" placeholder="请输入报关资料状态" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="目的国家" prop="destCountry">
-              <el-input v-model="form.destCountry" placeholder="请输入目的国家" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="目的国家名称" prop="destCountryName">
-              <el-input v-model="form.destCountryName" placeholder="请输入目的国家名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="总件数" prop="totalParcelQty">
-              <el-input v-model="form.totalParcelQty" placeholder="请输入总件数" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="总运单数" prop="totalWaybillQty">
-              <el-input v-model="form.totalWaybillQty" placeholder="请输入总运单数" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="总体积" prop="totalVolume">
-              <el-input v-model="form.totalVolume" placeholder="请输入总体积" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="总重量" prop="totalWeight">
-              <el-input v-model="form.totalWeight" placeholder="请输入总重量" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="操作员" prop="opMan">
-              <el-input v-model="form.opMan" placeholder="请输入操作员" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="删除标志（0代表存在" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
-            </el-form-item>
-          </el-col>
+        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+          <el-col :span="12">
+            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+                <el-col :span="12">
+                  <el-form-item label="批次号" prop="batchNo">
+                    <el-input v-model="form.batchNo" placeholder="请输入批次号" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="批次名称" prop="batchName">
+                    <el-input v-model="form.batchName" placeholder="请输入批次名称" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="运输方式" prop="transType">
+                    <el-select v-model="form.transType" placeholder="运输方式" clearable filterable>
+                        <el-option
+                          v-for="item in dict.type.emis_biz_shipping_method"
+                          v-bind:key="item.value"
+                          v-bind:label="item.label"
+                          v-bind:value="item.value"
+                        />
+                      </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="起始网点" prop="startSiteCode">
+                    <EmisSiteSimplePicker1  v-model="form.startSiteCode" :placeholder="$t('起始网点')"   isInitiated="true" @onChange="onDestSiteChange"></EmisSiteSimplePicker1>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item :label="$t('下一网点')" prop="nextSiteCode">
+                    <span slot="label">
+                      <span style="color: red">{{ $t('下一网点') }}</span>
+                    </span>
+                    <EmisGetNextSitePicker :placeholder="$t('请选择')" v-model="form.destSite" ></EmisGetNextSitePicker>
+                  </el-form-item>
+                </el-col>
 
-        <!--
-         <el-form-item label="上级字典">
-              <treeselect
-                ref="tree"
-                v-model="form.parentId"
-                :options="emisTmsSiteBatchOptions"
-                :normalizer="normalizer"
-                :default-expand-level="1"
-                :show-count="true"
-                placeholder="选择上级"
-              />
-        </el-form-item>
-        -->
+               <el-col :span="8" v-if="form.transType==1">
+                  <el-form-item label="航空单号" prop="airBilllNo">
+                    <el-input v-model="form.airBilllNo" placeholder="请输入航空单号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="form.transType==2">
+                  <el-form-item label="车牌号" prop="carNo">
+                    <el-input v-model="form.carNo" placeholder="请输入车牌号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" v-if="form.transType==3">
+                  <el-form-item label="船次号" prop="shipNo">
+                    <el-input v-model="form.shipNo" placeholder="请输入船次号" />
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8" >
+                    <el-form-item label="预计发出时间" prop="etd">
+                      <el-date-picker clearable
+                        v-model="form.etd"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="预计发出时间">
+                      </el-date-picker>
+                    </el-form-item>
+                </el-col>
+
+              <el-col :span="8" >
+                  <el-form-item label="预计到达时间" prop="eta">
+                    <el-date-picker clearable
+                      v-model="form.eta"
+                      type="date"
+                      value-format="yyyy-MM-dd"
+                      placeholder="请选择预计到达时间">
+                    </el-date-picker>
+                  </el-form-item>
+              </el-col>
+             
+                <el-col :span="8">
+                  <el-form-item label="目的国家" prop="destCountry">
+                    <el-input v-model="form.destCountry" placeholder="请输入目的国家" />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :span="8">
+                  <el-form-item label="目的国家名称" prop="destCountryName">
+                    <el-input v-model="form.destCountryName" placeholder="请输入目的国家名称" />
+                  </el-form-item>
+                </el-col> -->
+                <el-col :span="8">
+                  <el-form-item label="包数" prop="packNum">
+                    <el-input v-model="form.packNum" placeholder="请输入包数" />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :span="8">
+                  <el-form-item label="总件数" prop="totalParcelQty">
+                    <el-input v-model="form.totalParcelQty" placeholder="请输入总件数" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="总运单数" prop="totalWaybillQty">
+                    <el-input v-model="form.totalWaybillQty" placeholder="请输入总运单数" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="总体积" prop="totalVolume">
+                    <el-input v-model="form.totalVolume" placeholder="请输入总体积" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="总重量" prop="totalWeight">
+                    <el-input v-model="form.totalWeight" placeholder="请输入总重量" />
+                  </el-form-item>
+                </el-col> -->
+                <!-- <el-col :span="8">
+                  <el-form-item label="操作员" prop="opMan">
+                    <el-input v-model="form.opMan" placeholder="请输入操作员" />
+                  </el-form-item>
+                </el-col> -->
+                <el-col :span="8">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" placeholder="请输入备注" />
+                  </el-form-item>
+                </el-col>        
+            </el-row>
+          </el-col>
+          <el-col :span="12">
+          
+          </el-col>
         </el-row>
+        
       </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -158,6 +141,7 @@
 
 <script>
 import { getTmsGroupBatchNo,listEmisTmsSiteBatch, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch";
+import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 
 export default {
   name: "emisTmsSiteBatchForm",
@@ -166,8 +150,8 @@ export default {
         type:Number
     }
   },
-  components: {  },
-  dicts: [
+  components: { EmisGetNextSitePicker },
+  dicts: ['emis_biz_shipping_method'
   ],
   data() {
     return {
diff --git a/src/views/emis/emisTmsSiteBatch/index.vue b/src/views/emis/emisTmsSiteBatch/index.vue
index eefa9c5b..b9ca30f8 100644
--- a/src/views/emis/emisTmsSiteBatch/index.vue
+++ b/src/views/emis/emisTmsSiteBatch/index.vue
@@ -329,7 +329,7 @@
       </el-table-column>
     </XdTable>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisTmsSiteBatchForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsSiteBatchForm>
     </el-dialog>
     
diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
index 2ccb3b26..eef6ac12 100644
--- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
@@ -167,11 +167,7 @@
       <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
       <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
       <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" width="200">
-        <template slot-scope="scope">
-          <span class="ellipsis">{{scope.row.remark}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
       <el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
     </xd-table>
   </div>
@@ -729,10 +725,4 @@ export default {
         margin-right: 0;
     }
   }
-  .ellipsis {
-    width:200px;
-    overflow: hidden; /* 确保超出容器的内容被裁剪 */
-    white-space: nowrap; /* 确保文本在一行内显示 */
-    text-overflow: ellipsis; /* 超出部分显示省略号 */
-  }
 </style>
diff --git a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
index 882145e5..9e5f7ac7 100644
--- a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
@@ -7,7 +7,7 @@
                 <span slot="label">
                   <span style="color: red">扫描单号</span>
                 </span>
-                <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
+                <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  >
                   <i slot="suffix" class="iconfont">&#xe656;</i>
                 </el-input>
               </el-form-item>
@@ -16,10 +16,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item :label="$t('通知网点')" prop="notifySite" label-width="80px">
-                <!-- <EmisSiteSimplePicker v-model="form.notifySite"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker> -->
-                <el-select v-model="form.notifySiteCode" @change="onScanSiteSelect">
-                  <el-option v-for="item in notifySiteDataSource" :key="item.siteCode" :value="item" :label="item.siteName"  ></el-option>
-                </el-select>
+                <EmisSiteSimplePicker v-model="form.notifySite"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -41,6 +38,16 @@
                 <ImageUpload v-model="form.picUrl" @input="handleInput" :isShowTip="false" ></ImageUpload>
                 </el-form-item>
             </el-col>
+
+            <el-col :span="8">
+              <el-button
+                type="primary"
+                plain
+                icon=""
+                size="mini"
+                @click="handleScanInput"
+              >登记</el-button>
+            </el-col>
         </el-row>
       </el-form>
 
@@ -59,15 +66,6 @@
            >
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon=""
-                size="mini"
-                @click="handleRegister"
-              >登记</el-button>
-            </el-col>
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -127,13 +125,13 @@
       </div>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <el-table-column :label="$t('状态')" align="center" prop="currentStatus" min-width="100" />
       <el-table-column :label="$t('通知网点')" align="center" prop="notifySiteName" min-width="100" />
       <el-table-column :label="$t('登记网点')" align="center" prop="scanSite" min-width="100" />
       <el-table-column :label="$t('登记日期')" align="center" prop="scanDate" min-width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.scanDate) }}</span>
-        </template>
+              <span>{{ parseTime(scope.row.scanDate) }}</span>
+            </template>
+        </el-table-column>
       </el-table-column>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" />
       <el-table-column :label="$t('登记人')" align="center" prop="scanMan" min-width="100" />
@@ -175,6 +173,9 @@
               <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
+          </el-col>
          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer" style="text-align:center">
@@ -217,8 +218,6 @@ export default {
       // 问题件表格数据
       emisWaybillList: [],
 
-      notifySiteDataSource:[],
-
       title: "",
       open: false,
       titleBatch:"",
@@ -228,9 +227,10 @@ export default {
       problemType:null,
       openForm: false,
       titleForm: "",
-      tempRecord:{},
+
       titleEmisWaybillProblemInfo: "",
       openEmisWaybillProblemInfo: false,
+
       // 显示编辑框更多
       moreInputVisible: false,
 
@@ -286,14 +286,13 @@ export default {
       this.multiple = !selection.length
     },
     onScanSiteSelect(item){
-      // debugger
       if(!item){
-        this.form.notifySiteCode = null;
-        this.form.notifySiteName = null;
+        this.form.modifyNotifySite = null;
+        this.form.modifyNotifySiteName = null;
         return;
       }
-      this.form.notifySiteCode=item.siteCode;
-      this.form.notifySiteName=item.siteName;
+      this.form.notifySite=item && item.siteCode;
+      this.form.notifySiteName=item && item.siteName;
     },
     onproblemTypeSelect(item){
       // debugger;
@@ -346,68 +345,22 @@ export default {
         this.$message.error("输入单号后回车");
         return;
       }
-      // this.getWaybill(this.form.billCode)
-      this.loading = true;
-      listEmisWaybill({billCode:this.form.billCode}).then(response => {
-        this.loading = false;
-        let scanDate = new Date();
-        if(response.code != 200){
-          this.$message.error(response.msg);
-          return;
-        }
-        let rows = response.rows;
-        if(!rows || rows.length == 0){
-          this.$message.error("未查到单号");
-          this.form.billCode=null;
-          return;
-        }
-        if(rows.length>0) {
-          let rsItem = rows[0];
-          console.log(rsItem);
-          this.tempRecord =Object.assign({}, rsItem)
-          // tempRecord.notifySite = tempRecord.sendSiteCode;
-          // tempRecord.notifySiteName = tempRecord.sendSiteName;
-          this.tempRecord.scanSiteCode=this.form.scanSiteCode;
-          this.tempRecord.scanSite=this.form.scanSite;
-          this.tempRecord.scanDate=scanDate;
-          this.tempRecord.scanMan=this.form.scanMan;
-          this.tempRecord.scanManCode=this.form.scanManCode;
-          this.tempRecord.dataFrom="PC";
-          this.notifySiteDataSource=[
-            {
-              siteCode:this.tempRecord.sendSiteCode,
-              siteName:this.tempRecord.sendSiteName,
-            },
-            {
-              siteCode:this.tempRecord.dispatchUnderlingSiteCode,
-              siteName:this.tempRecord.dispatchUnderlingSiteName,
-            }
-          ]
-          // this.billInputDisabled = true;
-          // this.emisWaybillList.push(tempRecord);
-          // this.dataMap[this.form.billCode]=tempRecord;
-        }
-        // this.form.billCode=null;
-      })
-    },
-    handleRegister(){
+      // if(this.form.notifySite==null || this.form.notifySite==''){
+      //   this.$message.error("请选择通知网点");
+      //   return;
+      // }
 
-      this.tempRecord.notifySiteCode = this.form.notifySiteCode;
-      this.tempRecord.notifySiteName =  this.form.notifySiteName;
-      this.tempRecord.problemType = this.form.problemType;
-      this.tempRecord.problemId = this.form.problemId;
-      this.tempRecord.remark = this.form.remark;
-      this.tempRecord.picUrl=this.form.picUrl;
-      this.emisWaybillList.push(this.tempRecord);
-      this.dataMap[this.form.billCode]=this.tempRecord;
+      // if(this.form.problemType==null || this.form.problemType==''){
+      //   this.$message.error("请选择问题类型");
+      //   return;
+      // }
 
-      //清理数据
-      this.form.notifySiteCode="";
-      this.form.notifySiteName="";
-      this.tempRecord=null;
-      this.form.billCode=null;
-      this.notifySiteDataSource=[];
-      console.log(this.emisWaybillList)
+      // if(this.dataMap[this.form.billCode]){
+      //   this.$message.error("重复登记");
+      //   this.playNoticeTone(1);
+      //   return;
+      // }
+      this.getWaybill(this.form.billCode)
     },
     getWaybill(billCode){
       this.loading = true;
@@ -427,13 +380,12 @@ export default {
           let rsItem = rows[index];
           console.log(rsItem);
           let record =Object.assign({}, rsItem)
-          record.notifySiteCode = recs;
-          record.notifySiteName = record.sendSiteName;
+          record.notifySite = this.form.notifySite;
+          record.notifySiteName = this.form.notifySiteName;
           record.scanSiteCode=this.form.scanSiteCode;
           record.scanSite=this.form.scanSite;
           record.scanDate=scanDate;
           record.problemType=this.form.problemType;
-          record.problemId=this.form.problemId;
           record.scanMan=this.form.scanMan;
           record.scanManCode=this.form.scanManCode;
           record.picUrl=this.form.picUrl;
@@ -447,49 +399,48 @@ export default {
     },
     handleUpload(){
       let scanData=[];
-      // let problemInfoList=[];
+      let problemInfoList=[];
       this.emisWaybillList.forEach(item=>{
-        // item.currentStatus="已上传";
         if(this.ids.indexOf(item.id) > -1){
           scanData.push(
             {
               billCode:item.billCode,
-              problemType:item.problemId,
-              notifySite:item.notifySiteCode,
+              problemType:item.problemType,
+              notifySite:item.notifySite,
               picUrl:item.picUrl,
               remark:item.remark,
               scanWeight:item.scanWeight,
               scanDate:item.scanDate
             }
           )
-          // problemInfoList.push({
-          //   billCode: item.billCode,
-          //   problemType: item.problemType,
-          //   problemTitle: null,
-          //   problemCause: item.remark,
-          //   sendSite: item.sendSiteName,
-          //   sendSiteCode: item.sendSiteCode,
-          //   registerManCode: item.registerManCode,
-          //   registerManDept: null,
-          //   registerSiteCode: item.registerSiteCode,
-          //   registerDate: item.registerDate,
-          //   registerSaveDate: null,
-          //   dataFrom: item.dataFrom,
-          //   status: null,//item.waybillStatus,//？？？？？？？？是否正确
-          //   isSendSiteRegister: null,
-          //   // blReversion: false,//？？？？？？？？是否正确
-          //   blReversion: null,
-          //   reversionStr: null,
-          //   reversionMan: null,
-          //   reversionManCode: null,
-          //   reversionDate: null,
-          //   blCheckok: null,
-          //   blSee: null,
-          //   filePath: item.picUrl,
-          //   modifySiteCode: null,
-          //   delFlag: item.delFlag,//？？？？？？？？是否正确
-          //   remark: item.remark,//？？？？？？？？是否正确
-          // })
+          problemInfoList.push({
+            billCode: item.billCode,
+            problemType: item.problemType,
+            problemTitle: null,
+            problemCause: item.remark,
+            sendSite: item.sendSiteName,
+            sendSiteCode: item.sendSiteCode,
+            registerManCode: item.registerManCode,
+            registerManDept: null,
+            registerSiteCode: item.registerSiteCode,
+            registerDate: item.registerDate,
+            registerSaveDate: null,
+            dataFrom: item.dataFrom,
+            status: null,//item.waybillStatus,//？？？？？？？？是否正确
+            isSendSiteRegister: null,
+            // blReversion: false,//？？？？？？？？是否正确
+            blReversion: null,
+            reversionStr: null,
+            reversionMan: null,
+            reversionManCode: null,
+            reversionDate: null,
+            blCheckok: null,
+            blSee: null,
+            filePath: item.picUrl,
+            modifySiteCode: null,
+            delFlag: item.delFlag,//？？？？？？？？是否正确
+            remark: item.remark,//？？？？？？？？是否正确
+          })
         }
       });
 
@@ -499,8 +450,6 @@ export default {
         scanData:scanData
       };
 
-      let newList = [];
-
       doScan(scanProblemInfo).then(response => {
         let scanRstItem = response.data.scanResult[0];
         console.log(scanRstItem);
@@ -508,29 +457,24 @@ export default {
           this.$modal.msgError(scanRstItem.message);
           return;
         }
-        this.emisWaybillList.forEach(item=>{
-          if(this.ids.indexOf(item.id) > -1){
-            item.currentStatus="已上传";
-          }
-          newList.push(item);
-        })
-        this.emisWaybillList = newList;
+
         this.$modal.msgSuccess(scanRstItem.message);
       });
-      // problemInfoList.forEach(item => {
-      //   addEmisWaybillProblemInfo(item).then(response => {
-      //     // debugger;
-      //     if(response.code != "200"){
-      //       this.$modal.msgError(response.msg);
-      //       return;
-      //     }
-      //     this.$modal.msgSuccess(response.msg);
-      //   })
-      // })
+      problemInfoList.forEach(item => {
+        addEmisWaybillProblemInfo(item).then(response => {
+          // debugger;
+          if(response.code != "200"){
+            this.$modal.msgError(response.msg);
+            return;
+          }
+          this.$modal.msgSuccess(response.msg);
+        })
+      })
     },
     /** 提交按钮 */
     submitForm() {
       let newList = [];
+      debugger
       for(let i = 0; i< this.emisWaybillList.length;i++){
         let waybill = {...this.emisWaybillList[i]};
         if(this.ids.indexOf(waybill.id) > -1){
diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
index 1e7e15c0..b94ab6a4 100644
--- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
+++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
@@ -131,11 +131,7 @@
       <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
       <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
       <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" width="200">
-        <template slot-scope="scope">
-          <span class="ellipsis">{{scope.row.remark}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
       <el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
     </xd-table>
     <el-divider class="divider"></el-divider>
@@ -884,11 +880,4 @@ export default {
     padding: 0 12px 0 0;
     box-sizing: border-box;
   }
-  
-  .ellipsis {
-    width:200px;
-    overflow: hidden; /* 确保超出容器的内容被裁剪 */
-    white-space: nowrap; /* 确保文本在一行内显示 */
-    text-overflow: ellipsis; /* 超出部分显示省略号 */
-  }
 </style>
diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
index 77e89e56..868e7fd9 100644
--- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
@@ -126,11 +126,7 @@
       <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
       <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
       <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" width="200">
-        <template slot-scope="scope">
-          <span class="ellipsis">{{scope.row.remark}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
       <el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
     </xd-table>
     <el-divider class="divider"></el-divider>
@@ -834,10 +830,4 @@ export default {
     padding: 0 12px 0 0;
     box-sizing: border-box;
   }
-  .ellipsis {
-    width:200px;
-    overflow: hidden; /* 确保超出容器的内容被裁剪 */
-    white-space: nowrap; /* 确保文本在一行内显示 */
-    text-overflow: ellipsis; /* 超出部分显示省略号 */
-  }
 </style>
diff --git a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
index b1e3670e..4d3780dc 100644
--- a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
+++ b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
@@ -50,7 +50,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="转件时间" prop="dateTimeRange" label-width="80px">
-              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+              <elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
           </el-col>
         </el-col>
@@ -156,23 +156,18 @@
       <el-table-column :label="$t('目的城市')" align="center" prop="transferCity" min-width="100" />
       <el-table-column :label="$t('物流公司联系人')" align="center" prop="linkMan" min-width="100" />
       <el-table-column :label="$t('电话')" align="center" prop="linkPhone" min-width="100" />
-      <el-table-column :label="$t('签收状态')" align="center" prop="xxxx" min-width="100">
-        <template slot-scope="scope">
-            <el-tag v-if="scope.row.waybillDetail.waybillStatus=='50'" type="success">已签收</el-tag>
-            <el-tag v-else type="danger">未签收</el-tag>
-        </template>
-      </el-table-column>
+      <el-table-column :label="$t('签收状态')" align="center" prop="xxxx" min-width="100" />
       <el-table-column :label="$t('转件重量')" align="center" prop="transferWeight" min-width="100" />
       <el-table-column :label="$t('转件体积')" align="center" prop="transferVolume" min-width="100" />
-      <el-table-column :label="$t('转件网点')" align="center" prop="createSiteName" min-width="100" />
-      <el-table-column :label="$t('操作人')" align="center" prop="createByName" min-width="100" />
+      <el-table-column :label="$t('转件网点')" align="center" prop="xxxx" min-width="100" />
+      <el-table-column :label="$t('操作人')" align="center" prop="xxxx" min-width="100" />
       <el-table-column :label="$t('转件原因')" align="center" prop="transferResean" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
     </xd-table>
     <!-- 添加或修改转件对话框 -->
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="800px" v-dialogDrag :close-on-click-modal="false" append-to-body>
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" size="mini" label-width="80px" :rules="rules">
-        <el-row :gutter="0">
+        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="8">
             <el-form-item :label="$t('运单编号')" prop="billCode" label-width="80px">
               <el-input v-model="form.billCode"></el-input>
@@ -371,13 +366,6 @@ export default {
     });
     // this.getList();
   },
-  mounted() {
-    const end = new Date()
-    const start = new Date()
-    start.setHours(0,0,0,0)
-    end.setHours(23,59,59,0)
-    this.dateTimeRange=[start,end];
-  },
   methods: {
     /** 查询运单转件表列表 */
     getList() {