Przeglądaj źródła

Merge branch 'wuguojie' into dev

wuguojie 1 rok temu
rodzic
commit
5301bd9fbf

+ 8 - 8
package-lock.json

@@ -182,7 +182,7 @@
     },
     },
     "@riophae/vue-treeselect": {
     "@riophae/vue-treeselect": {
       "version": "0.4.0",
       "version": "0.4.0",
-      "resolved": "https://registry.npmmirror.com/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
       "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
       "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
       "requires": {
       "requires": {
         "@babel/runtime": "^7.3.1",
         "@babel/runtime": "^7.3.1",
@@ -2703,7 +2703,7 @@
     },
     },
     "crypto-js": {
     "crypto-js": {
       "version": "4.2.0",
       "version": "4.2.0",
-      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
       "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
       "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
     },
     "css-color-names": {
     "css-color-names": {
@@ -3082,7 +3082,7 @@
     },
     },
     "decimal.js": {
     "decimal.js": {
       "version": "10.4.3",
       "version": "10.4.3",
-      "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
     },
     "decode-uri-component": {
     "decode-uri-component": {
@@ -6275,7 +6275,7 @@
     },
     },
     "highlight.js": {
     "highlight.js": {
       "version": "9.18.5",
       "version": "9.18.5",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
+      "resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-9.18.5.tgz",
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA=="
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA=="
     },
     },
     "hmac-drbg": {
     "hmac-drbg": {
@@ -7739,7 +7739,7 @@
     },
     },
     "marked": {
     "marked": {
       "version": "0.4.0",
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-0.4.0.tgz",
       "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="
       "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="
     },
     },
     "material-colors": {
     "material-colors": {
@@ -13797,7 +13797,7 @@
     },
     },
     "vue-doc-preview": {
     "vue-doc-preview": {
       "version": "0.3.2",
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz",
       "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==",
       "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==",
       "requires": {
       "requires": {
         "axios": "^0.18.0",
         "axios": "^0.18.0",
@@ -14017,7 +14017,7 @@
     },
     },
     "vue-tree-to-table": {
     "vue-tree-to-table": {
       "version": "1.0.4",
       "version": "1.0.4",
-      "resolved": "https://registry.npmmirror.com/vue-tree-to-table/-/vue-tree-to-table-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/vue-tree-to-table/-/vue-tree-to-table-1.0.4.tgz",
       "integrity": "sha512-uHVjc8Vu45JkIZEYexZDnuONSn+1IjWknIhDlkk4Qoo2LpGUcR+DaYQROGcIziAXULcUS94ye8Fzooy2KKFH3w==",
       "integrity": "sha512-uHVjc8Vu45JkIZEYexZDnuONSn+1IjWknIhDlkk4Qoo2LpGUcR+DaYQROGcIziAXULcUS94ye8Fzooy2KKFH3w==",
       "requires": {
       "requires": {
         "element-ui": "^2.15.1",
         "element-ui": "^2.15.1",
@@ -14026,7 +14026,7 @@
       "dependencies": {
       "dependencies": {
         "vue": {
         "vue": {
           "version": "2.7.16",
           "version": "2.7.16",
-          "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz",
+          "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
           "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
           "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
           "requires": {
           "requires": {
             "@vue/compiler-sfc": "2.7.16",
             "@vue/compiler-sfc": "2.7.16",

+ 3 - 0
src/views/Task/daikeComponents/KtLetter1.vue

@@ -6722,6 +6722,9 @@ export default {
 
 
         if (paramsEdit.carinfo.transferFlag) {
         if (paramsEdit.carinfo.transferFlag) {
           this.transferDateShow = true;
           this.transferDateShow = true;
+        } else {
+          this.transferDateShow = false;
+          this.carInfo.transferDate = ''
         }
         }
         paramsEdit.risk.map(ele => {
         paramsEdit.risk.map(ele => {
           if (ele.riskCode == "0507") {
           if (ele.riskCode == "0507") {