kehumingdan修改

src/components/OP/PickupList.vue

@@ -939,10 +939,22 @@ export default {
             return yyyy + '-' + MM + '-' + DD
         },
         //输入
-        InputValue() {
+        InputValue(val) {
             let surname = '';
-            let surname1 = pinyin(this.pickupinif.surname, { toneType: 'none' }).toUpperCase();
-            let surname2 = pinyin(this.pickupinif.name, { toneType: 'none' }).toUpperCase();
+            let surname1 = '';
+            let surname2 = '';
+            var pattern2 = new RegExp("[A-Za-z]+");
+            console.log(val);
+            if (pattern2.test(this.pickupinif.surname)) {
+                surname1 = this.pickupinif.surname.toUpperCase();
+            }else{
+                surname1 = pinyin(this.pickupinif.surname, { toneType: 'none' }).toUpperCase();
+            }
+            if (pattern2.test(this.pickupinif.name)) {
+                surname2 = this.pickupinif.name.toUpperCase();
+            }else{
+                surname2 = pinyin(this.pickupinif.name, { toneType: 'none' }).toUpperCase();
+            }
             surname = surname1 + '/' + surname2;
             this.pickupinif.Pinyin = surname;
             console.log(surname)