md

package.json

@@ -66,7 +66,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "js-md5": "^0.7.3",
-    "jsbarcode": "^3.11.5",
+    "jsbarcode": "^3.11.6",
     "jsencrypt": "3.2.1",
     "jsmind": "^0.4.11",
     "jspdf": "^2.5.1",

src/utils/custom.js

@@ -570,6 +570,7 @@ return null;
 }
 
 export function dateToStr(date){
+  if (typeof date === "object" && date instanceof Date) {
     var year = date.getFullYear();//年
     var month = date.getMonth();//月
     var day = date.getDate();//日
@@ -582,6 +583,9 @@ export function dateToStr(date){
         (hours > 9 ? hours : ("0" + hours)) + ":" +
         (min > 9 ? min : ("0" + min)) + ":" +
         (second > 9 ? second : ("0" + second));
+  }else{
+    return date;
+  }
 }
 
 export function strToDate(datestr){
@@ -590,15 +594,21 @@ export function strToDate(datestr){
 
 //字符串转字符串
 export function formatDate(dateStr) {
+  if(!dateStr) return dateStr;
+
   var newdateStr = dateStr.replace(/\d+(?=-[^-]+$)/, (a) => (parseInt(a, 10) - 1));  //字符串处理(月份)
   var nums = newdateStr.match(/\d+/g);  //取数
   var date = eval('new Date(' + nums + ')');  //转换
   //重组
+  if (typeof date === "object" && date instanceof Date) {
     var datetime =
         date.getFullYear() + "-" +  //年
         ((date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0" + (date.getMonth() + 1)) + "-" +  //月
         (date.getDate() > 9 ? date.getDate() : ("0" + date.getDate()));  //日
     return datetime;
+  }else{
+    return dateStr;
+  }
 }
 
 

src/utils/pdfUtils.js

@@ -1,4 +1,5 @@
 import { degrees,PageSizes, PDFDocument, rgb, StandardFonts } from 'pdf-lib';
+import JsBarcode from 'jsbarcode'
 import axios from "axios";
 import Buffer from 'vue-buffer'
 import * as pdfjs from 'pdfjs-dist';

src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue

@@ -17,9 +17,10 @@
           <el-col :span="8">
             <el-form-item :label="$t('扫描类型')" prop="scanType">
               <el-select v-model="queryParams.scanType" :placeholder="$t('全部')" value="0">
-                <el-option :label="$t('派件')" value="1"></el-option>
+                <el-option :label="$t('网点发件')" value="20"></el-option>
-                <el-option :label="$t('到件')" value="2"></el-option>
+                <el-option :label="$t('网点到件')" value="30"></el-option>
-                <el-option :label="$t('发件')" value="3"></el-option>
+                <el-option :label="$t('网点派件')" value="40"></el-option>
+
               </el-select>
             </el-form-item>
           </el-col>
@@ -60,6 +61,7 @@
           @selection-change="handleSelectionChange"
           @sort-change="handleSortChange"
           @row-dblclick="getDetailList"
+          highlight-current-row
           v-if="tableHeight" :max-height="tableHeight + 'px'"
         >
           <div slot="toolbar">
@@ -275,12 +277,11 @@ export default {
       queryParams: {
         pageNum:1,
         pageSize:20,
-        scanType:1,
+        scanType:null,
-        scanSiteCode:$store.getters.ownerSiteCode,
+        scanSiteCode:this.$store.getters.ownerSiteCode,
         preOrNextStationCode:null,
         scanManCode:null,
         params:{
-          thisSiteScanType:1,
           beginScanDate:null,
           endScanDate:null,
         },//扩展参数
@@ -297,6 +298,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.scanType='20';
     // this.getList();
     this.$nextTick(function() {
       let queryFormEl = this.$refs.queryForm.$el;