Merge pull request 'develop' (#192) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/192

src/views/emis/emisTmsScanRecord/outgoingScan.vue

@@ -66,6 +66,9 @@
                   v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
+              <el-col :span="1.5">
+                 <el-checkbox v-model="blLastTrack" label="1" style="line-height: 32px;" >轨迹已结束</el-checkbox>
+              </el-col>
           </el-row>
       </div>
 
@@ -159,7 +162,7 @@ export default {
       emisTmsScanRecordList: [],
       queryParams:{},
       tableHeight: 200,
-
+      blLastTrack:0,
       // 是否显示弹出层
       open: false,
       // 表单校验
@@ -416,29 +419,33 @@ export default {
       });
 
        // 检查
-      let scanInfo = {scanType:"20",opType:2,scanData:scanData}
+      let scanInfo = {scanType:"20",opType:2,scanData:scanData, blLastTrack:this.blLastTrack?1:0}
-      console.log(scanInfo)
+      let count = 0;
-
       doScan(scanInfo).then(response => {
-        console.log(response);
         let scanRstItem = response.data.scanResult[0];
-        console.log(scanRstItem);
+        let scanRstItems = response.data.scanResult;
-        if(scanRstItem.result != 'success'){
+        // if(scanRstItem.result != 'success'){
-          this.$modal.msgError(scanRstItem.message);
+        //   this.$modal.msgError(scanRstItem.message);
-          return;
+        //   return;
-        }
+        // }
         let newList = [];
         this.emisTmsScanRecordList.forEach(item => {
-          if(this.ids.indexOf(item.billCode) > -1){
+          // item.billcode 在 scanResultItem 里面result 不是成功 就加入newList
-            this.dataMap[item.billCode]=null;
+          let scanRstItemResult = scanRstItems.find(scanRstItem => scanRstItem.billCode == item.billCode);
-          }else{
+          if (scanRstItemResult.result != 'success') {
+            if (count == 0) {
+              this.$modal.msgError(scanRstItem.message);
+            }
+            count++;
             newList.push(item);
           }
         })
         this.ids = [];
         this.selection = null;
         this.emisTmsScanRecordList = newList;
-        this.$modal.msgSuccess(scanRstItem.message);
+        if(newList.length == 0){ // 所有都成功
+          this.$modal.msgSuccess("上传成功");
+        }
       });
 
 

src/views/emis/emisTmsScanRecord/scanRecordQuery.vue

@@ -56,6 +56,12 @@
           <el-form-item :label="$t('目的地')" prop="destCode" label-width="100px">
             <DestinationPicker v-model="queryParams.destCode"  @onChange="onDestinationSelect"  ></DestinationPicker>
           </el-form-item>
+          <el-form-item :label="$t('轨迹已结束')">
+            <el-select v-model="queryParams.blLastTrack" clearable :placeholder="$t('请选择')" >
+              <el-option :label="$t('是')" value="1"></el-option>
+              <el-option :label="$t('否')" value="0"></el-option>
+            </el-select>
+          </el-form-item>
         </el-col>
 
       </el-row>
@@ -162,7 +168,12 @@
       </el-table-column>
       <el-table-column :label="$t('扫描重量')" align="center" prop="scanWeight" min-width="100" />
       <el-table-column :label="$t('车牌号')" align="center" prop="carNo" min-width="100" />
-
+      <el-table-column :label="$t('轨迹已结束')" align="center" prop="blLastTrack" min-width="100">
+        <template slot-scope="scope">
+          <el-tag  type="error" v-if="scope.row.blLastTrack==1">已结束</el-tag>
+          <el-tag type="success" v-else>未结束</el-tag>
+        </template>
+      </el-table-column>
     </xd-table>
 
     <!-- 添加或修改网点电子面单申请对话框 -->
@@ -305,6 +316,7 @@ export default {
         queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：0
         // scanType:"",
         isSubBill:"",
+        blLastTrack:null,
       },
       // 修改参数
       modifyParams:{

src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue

@@ -208,7 +208,7 @@
       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
       <el-table-column :label="$t('付款方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail?.paymentType"/>
           </template>
       </el-table-column>