Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/components/form.vue

@@ -881,6 +881,14 @@ export default {
       type: Object,
       default: () => {},
     },
+    fileBase64: {
+      type: Object,
+      default: () => {},
+    },
+    base64Transform: {
+      type: Boolean,
+      default: false,
+    },
     propTitle: String,
     pageBs: String,
   },
@@ -890,11 +898,9 @@ export default {
       rules: {},
       propFormField: this.formField,
       formLabelAlign: this.formLabelAligns,
-      rules: {},
       fileLists: {},
       imageUrl: {},
       shade: false,
-      fileBase64:''
     };
   },
   created() {
@@ -1405,9 +1411,12 @@ export default {
       );
       // debugger;
       if (item.type == "photo") {
+        if(this.base64Transform){
           this.getBase64(file.raw).then((resBase64) => {
-          this.fileBase64 = resBase64.split(",")[1]; //直接拿到base64信息
+            this.fileBase64[item.id] = resBase64.split(",")[1]; //直接拿到base64信息
+            this.$emit("onBase64Transform", this.fileBase64);
           });
+        }
         if (isJPG) {
           this.$set(self.imageUrl, item.id, file.raw);
           this.$set(

src/views/dswtzxx/dnaxx/adddna.vue

@@ -16,7 +16,7 @@
 <script>
   import formCompontent from "@c/form.vue";
 
-  import { insertRyxx,selectRyxxById, selectRyzpList, updateRyxx} from "@/api/dswtzxx.js";
+  import { selectRyxxById, selectRyzpList, updateRyxx} from "@/api/dswtzxx.js";
   import {
     insertDna,
   } from "@/api/dswtz/dnaxx.js";
@@ -75,16 +75,6 @@
                 placeholder: "请输入",
                 col: "2",
               },
-            /*  {
-                name: "宗教信仰:",
-                id: "zjxydm",
-                type: "codeTree",
-                codeTree: "CODE_ZJXY",
-                codeOptions: [],
-                value: "",
-                placeholder: "请输入",
-                col: "2",
-              },*/
             ],
           },
         ],
@@ -103,8 +93,6 @@
           updateRyxx(params)
         }
         else {
-          let sd = 'R5400000000002021110009'
-          params.append('rybh',sd)
           insertDna(params)
         }
 
@@ -131,7 +119,6 @@
             let rows = res.data.rows
             for(let i of rows.values()){
               let zpbw = i.zpbw
-              let ryzpDzwjmc = i.ryzpDzwjmc.split('.')[1]
               let arr = [
                 {
                   name: i.ryzpDzwjmc,