去掉多余字符 && 修改部分逻辑

src/views/emis/emisTmsPack/packageManagement.vue

@@ -203,11 +203,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="$t('生成网点')" prop="sendStiteCode">
+              <el-form-item :label="$t('生成网点')" prop="sendSiteCode">
                 <span slot="label">
                   <span style="color: red">{{ $t('生成网点') }}</span>
                 </span>
-                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.sendStiteCode" ></EmisSiteSimplePicker>
+                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.sendSiteCode" v-if="$store.getters.ownerSiteCode== '88888'" ></EmisSiteSimplePicker>
+                <el-input v-else  v-model="coData.sendSiteName" placeholder="" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -361,7 +362,7 @@
         </el-table-column>
         <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
         <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-        <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+        <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
         <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
         <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
         <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
@@ -484,7 +485,7 @@
         <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
         <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
         <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-        <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+        <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
         <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
         <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
         <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
@@ -595,7 +596,7 @@ export default {
         destCountry: null,
         destCountryName: null,
         blUnpack: null,
-        sendStiteCode: null,
+        sendSiteCode: null,
         totalParcelQty: null,
         totalWaybillQty: null,
         totalVolume: null,
@@ -611,6 +612,7 @@ export default {
     };
   },
   created() {
+    
   },
 
   mounted() {
@@ -672,7 +674,7 @@ export default {
       this.wayBillData.dateTimeRange=value;
     },
     async handleAddCoPack(){
-      if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
+      if(!this.coData.destCountry || !this.coData.sendSiteCode || !this.coData.nextSiteCode || !this.blUnpack){
         this.$modal.msgError("请先选择必填项")
         return;
       }
@@ -688,7 +690,8 @@ export default {
         nextSiteCode: this.coData.nextSiteCode,
         // destCountryName: this.coData.,
         blUnpack: this.coData.blUnpack,
-        sendStiteCode: this.coData.sendStiteCode,
+        sendSiteCode: this.coData.sendSiteCode,
+        sendSiteName: this.coData.sendSiteName,
         totalParcelQty: this.coData.totalParcelQty,
         totalWaybillQty: this.coData.totalWaybillQty,
         totalVolume: this.coData.totalVolume,
@@ -726,7 +729,7 @@ export default {
       }else if(this.coPackType == "edit"){// 修改
         //第一步：处理合包信息的更新；
         if(this.tempCoPackInfo.destCountry != this.coData.destCountry
-          || this.tempCoPackInfo.sendStiteCode != this.coData.sendStiteCode
+          || this.tempCoPackInfo.sendSiteCode != this.coData.sendSiteCode
           || this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode
           || this.tempCoPackInfo.blUnpack != this.blUnpack
           || this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty
@@ -735,7 +738,7 @@ export default {
           || this.tempCoPackInfo.totalVolume != this.coData.totalVolume
         ){
           this.tempCoPackInfo.destCountry = this.coData.destCountry;
-          this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
+          this.tempCoPackInfo.sendSiteCode = this.coData.sendSiteCode;
           this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
           this.tempCoPackInfo.blUnpack = this.blUnpack;
           this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
@@ -909,7 +912,7 @@ export default {
         totalWeight +=item.billWeight;
         totalVolume +=item.totalVolume;
         item.destCountry = this.coData.destCountry;
-        item.sendStiteCode = this.coData.sendStiteCode;
+        item.sendSiteCode = this.coData.sendSiteCode;
         item.nextSiteCode = this.coData.nextSiteCode;
         item.blUnpack = this.blUnpack;
       })
@@ -939,10 +942,13 @@ export default {
       this.coData.createTime = parseTime(new Date());
       this.coData.destCountry = null;
       this.coData.destCountryName = null;
-      this.coData.sendStiteCode = null;
+      // this.coData.sendSiteCode = null;
       this.coData.nextSiteCode = null;
       this.coData.nextStation = null;
       this.blUnpack = "1";
+      
+      this.coData.sendSiteCode = this.$store.getters.ownerSiteCode;
+      this.coData.sendSiteName=this.$store.getters.ownerSiteName;
 
       this.currentId=null;
       this.openForm= true;
@@ -968,7 +974,8 @@ export default {
       this.coData.createTime = resData.createTime;
       this.coData.destCountry = resData.destCountry;
       // this.coData.destCountryName = null;
-      this.coData.sendStiteCode = resData.sendStiteCode;
+      this.coData.sendSiteCode = resData.sendSiteCode;
+      this.coData.sendSiteCode = resData.sendSiteName;
       this.coData.nextSiteCode = resData.nextSiteCode;
       // this.coData.nextStation = null;
       this.blUnpack = resData.blUnpack;
@@ -982,13 +989,6 @@ export default {
       this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
       this.tempCoPackInfo = resData;
       for(let p = 0; p < resList.rows.length;p++){
-        // let resd = await getWaybillDetail(resList.rows[p].billCode);
-        // if(!resd || resd.code != 200){
-        //   this.$message.error(resd && resd.msg || "未知错误");
-        //   return;
-        // }
-        // this.emisCoPackDetail.push(resd.data);
-        ;
         this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
       }
       this.coData.packStatus = this.tempCoPackInfo.packStatus;
@@ -1039,7 +1039,7 @@ export default {
                 const curList = response.rows
                 import('@/vendor/Export2Excel').then(excel => {
                   const tHeader = ['id','合包号','合包名称','合包时间','目的国家','目的国家名称','是否可拆','发出网点','下一网点','下一站','总件数','总运单数','总体积','总重量','合包状态','扩展数据','操作员','ext1','ext2','ext3','ext4','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
-                  const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendStiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+                  const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendSiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
                   const data = this.formatJson(filterVal, curList, response.rows)
                   excel.export_json_to_excel({
                     header: tHeader,

src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue

@@ -109,9 +109,6 @@
               <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">

src/views/emis/emisTmsScanRecord/arrivalScan.vue

@@ -108,9 +108,6 @@
               <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">

src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue

@@ -109,9 +109,6 @@
               <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">

src/views/emis/emisTmsScanRecord/coPackageScanning.vue

@@ -114,9 +114,6 @@
               <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">

src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue

@@ -109,9 +109,6 @@
               <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">

src/views/emis/emisTmsScanRecord/deliveryScan.vue

@@ -101,9 +101,6 @@
               <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">

src/views/emis/emisTmsScanRecord/loadingScan.vue

@@ -106,9 +106,6 @@
               <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">

src/views/emis/emisTmsScanRecord/outgoingScan.vue

@@ -5,7 +5,7 @@
           <el-col :span="7">
             <el-form-item label="扫描单号" prop="billCode" label-width="70px">
               <span slot="label">
-                <span style="color: red">扫描单号</span>
+                <span style="color: red">{{$t('扫描单号')}}</span>
               </span>
               <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  >
                 <i slot="suffix" class="iconfont">&#xe656;</i>
@@ -21,6 +21,9 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('下一站')" prop="preOrNextStation">
+              <span slot="label">
+                <span style="color: red">{{$t('下一站')}}</span>
+              </span>
               <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
             </el-form-item>
           </el-col>
@@ -109,9 +112,6 @@
               <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">
@@ -221,6 +221,10 @@ export default {
       this.form.ids= arr.map(item=>item.id)
     },
     handleBatchScan(){
+      if(this.form.preOrNextStation==null || this.form.preOrNextStation==''){
+        this.$message.error("请先选择下一站");
+        return;
+      }
       this.formBatch = {
         billCode: null,
       }
@@ -422,6 +426,10 @@ export default {
         this.$message.error("输入单号后回车");
         return;
       }
+      if(this.form.preOrNextStation==null || this.form.preOrNextStation==''){
+        this.$message.error("请先选择下一站");
+        return;
+      }
 
       if(this.dataMap[this.form.billCode]){
         this.$message.error("重复扫描");

src/views/emis/emisTmsScanRecord/positionScanning.vue

@@ -112,9 +112,6 @@
               <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">

src/views/emis/emisTmsScanRecord/scanRecord.vue

@@ -108,9 +108,6 @@
               <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">

src/views/emis/emisTmsScanRecord/signAndRecord.vue

@@ -186,9 +186,6 @@
             <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">

src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue

@@ -99,7 +99,7 @@
         </xd-table>
       <!-- </el-tab-pane>
       <el-tab-pane label="明细数据" name="second"> -->
-      <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" v-dialogDrag :close-on-click-modal="false" append-to-body>
+      <el-dialog :title="titleForm" :visible.sync="openForm" width="90%" v-dialogDrag :close-on-click-modal="false" append-to-body>
         <xd-table v-loading="loading"
           border stripe
           size="small"
@@ -115,7 +115,7 @@
           <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
           <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate" min-width="170" >
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.scanDate) }}</span>
+              <span>{{ parseTime(scope.row.scanDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('扫描类型')" align="center" prop="scanType" min-width="100" >
@@ -180,10 +180,10 @@
           </el-table-column>
           <el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="170">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.waybillDetail.estimateDate) }}</span>
+              <span>{{ parseTime(scope.row.waybillDetail.estimateDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="100">
+          <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="120">
             <template slot-scope="scope">
               <span>{{ (scope.row.waybillDetail.receiveName) }}</span>
             </template>
@@ -354,7 +354,6 @@ export default {
       //   this.queryParams.params.beginScanDate = null;
       //   this.queryParams.params.endScanDate = null;
       // }
-      debugger;
       this.tempQueryParams.scanSiteCode = row.scanSiteCode;
       queryScanStatRecordList(this.tempQueryParams).then(response => {
         if(!response ||response.code != 200){

src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue

@@ -159,9 +159,6 @@
               <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">

src/views/emis/emisTmsScanRecord/unloadingScan.vue

@@ -102,9 +102,6 @@
               <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">

src/views/emis/emisTmsScanRecord/unpackScan.vue

@@ -100,9 +100,6 @@
               <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">

src/views/emis/emisWaybillProblemInfo/problemEntry.vue

@@ -173,9 +173,6 @@
               <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">