浏览代码

fix:适配旧数据

magic v 3 年之前
父节点
当前提交
ffeb70d89a
共有 2 个文件被更改,包括 7 次插入5 次删除
  1. 1 1
      src/pages/FormVolume/mixins/index.js
  2. 6 4
      src/pages/FormVolume/mixins/layout.js

+ 1 - 1
src/pages/FormVolume/mixins/index.js

@@ -179,7 +179,7 @@ export default {
           item.disabled = true
           item.disabled = true
         }
         }
         if (item.type === 'certificate') {
         if (item.type === 'certificate') {
-          item.certificate = ''
+          item.certificate = '身份证'
         }
         }
         if (item.type === 'area') {
         if (item.type === 'area') {
           item.area = ''
           item.area = ''

+ 6 - 4
src/pages/FormVolume/mixins/layout.js

@@ -74,16 +74,18 @@ export default {
       b && this.data.result.slice(0, 4).forEach((item, index) => {
       b && this.data.result.slice(0, 4).forEach((item, index) => {
         let eItem = topicObj.result[index]
         let eItem = topicObj.result[index]
         if (item.title === eItem.title) {
         if (item.title === eItem.title) {
-          if (item.type === 'area') {
-            let arr = eItem.val.split('<#>')
+          let sp = '<#>'
+          let regSp = new RegExp(sp)
+          if (item.type === 'area' && regSp.test(item.val)) {
+            let arr = eItem.val.split(sp)
             let area = arr[0].split(',')
             let area = arr[0].split(',')
             item.area = area.join()
             item.area = area.join()
             item.val1 = arr[1]
             item.val1 = arr[1]
             item.val2 = arr[2]
             item.val2 = arr[2]
             item.val = arr[3]
             item.val = arr[3]
           }
           }
-          else if (item.type === 'certificate') {
-            let arr = eItem.val.split('<#>')
+          else if (item.type === 'certificate' && regSp.test(item.val)) {
+            let arr = eItem.val.split(sp)
             item.certificate = arr[0]
             item.certificate = arr[0]
             item.val = arr[1]
             item.val = arr[1]
           } else {
           } else {