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

src/api/dswtzxx.js

@@ -31,3 +31,7 @@ export const insertZjbzjg = params =>
 
 export const insertZwbzjg = params =>
   postform(`${base.alyIP}/zwbzhc/insertZwbzjg`, params);
+export const selectZwbzjgList = params =>
+  postform(`${base.alyIP}/zwbzhc/selectZwbzjgList`, params);
+export const selectZjbzjgList = params =>
+  postform(`${base.alyIP}/ZjZjbzxx/selectZjbzjgList`, params);

src/views/dswtzxx/bzxx/addzj.vue

@@ -19,7 +19,7 @@
 <script>
   import formCompontent from "@c/form.vue";
 
-  import { insertZjbzjg,selectRyxxById, updateDnabzjg} from "@/api/dswtzxx.js";
+  import { insertZjbzjg,selectZjbzjgList, updateDnabzjg} from "@/api/dswtzxx.js";
   export default {
     name: "addryxx",
     components: {
@@ -171,7 +171,7 @@
         for(var i in this.fileBase64) {
           params.set(i,this.fileBase64[i])
         }
-        if(this.$route.query.rybh){
+        if(this.$route.query.xxzjbh){
           updateDnabzjg(params).then(res=>{
             if (res.success && res.code == 200) {
               this.$router.push("bzxxZj");
@@ -200,12 +200,9 @@
         });
         var self = this;
         let params = new FormData();
-        let params1 = new FormData();
-        params.append("rybh", this.rybh);
-        params1.append("asjxgrybh", this.rybh);
-
-        selectRyxxById(params).then((res) => {
-          var result = res.data.rows;
+        params.append("xxzjbh", this.xxzjbh);
+        selectZjbzjgList(params).then((res) => {
+          var result = res.data.rows[0];
           this.result = result;
           self.propFormField.forEach((fieldItem) => {
             if (fieldItem.data && fieldItem.data.length > 0) {
@@ -246,9 +243,9 @@
       if (this.$route.query.type) {
         this.type = this.$route.query.type;
       }
-      if (this.$route.query.rybh) {
+      if (this.$route.query.xxzjbh) {
         this.title = "DNA比中结果";
-        this.rybh = this.$route.query.rybh;
+        this.xxzjbh = this.$route.query.xxzjbh;
         this.getshuju();
       }
     },

src/views/dswtzxx/bzxx/addzw.vue

@@ -15,7 +15,7 @@
 <script>
   import formCompontent from "@c/form.vue";
 
-  import { insertZwbzjg,selectRyxxById, updateDnabzjg} from "@/api/dswtzxx.js";
+  import { insertZwbzjg,selectZwbzjgList, updateDnabzjg} from "@/api/dswtzxx.js";
   export default {
     name: "addryxx",
     components: {
@@ -176,31 +176,15 @@
         });
         var self = this;
         let params = new FormData();
-        let params1 = new FormData();
-        params.append("rybh", this.rybh);
-        params1.append("asjxgrybh", this.rybh);
+        params.append("xxzjbh", this.xxzjbh);
 
-        selectRyxxById(params).then((res) => {
-          var result = res.data.rows;
+        selectZwbzjgList(params).then((res) => {
+          var result = res.data.rows[0];
           this.result = result;
           self.propFormField.forEach((fieldItem) => {
             if (fieldItem.data && fieldItem.data.length > 0) {
               fieldItem.data.forEach((i) => {
-                if (i.id == "R_ZMZP_File") {
-                  if (res.data.fjlist && res.data.fjlist.length > 0) {
-                    console.log(9999);
-                    let arr = res.data.fjlist.map((i) => ({
-                      name: i.dzwjmc,
-                      url: i.dzwjwz,
-                      xxzjbh: i.xxzjbh,
-                    }));
-                    this.$set(this.formLabelAlign, i.id, arr);
-                  }
-                } else if (i.id == "zljsdwdm") {
-                  this.$set(this.formLabelAlign, i.id, result[i.id].split(","));
-                } else {
                 this.$set(this.formLabelAlign, i.id, result[i.id]);
-                }
               });
             }
             this.$forceUpdate();
@@ -219,11 +203,11 @@
           this.fileBase64[j.type]
         }
       }
-      if (this.$route.query.type) {
+      if (this.$route.query.xxzjbh) {
         this.type = this.$route.query.type;
       }
-      if (this.$route.query.rybh) {
-        this.rybh = this.$route.query.rybh;
+      if (this.$route.query.xxzjbh) {
+        this.xxzjbh = this.$route.query.xxzjbh;
         this.getshuju();
       }
     },

src/views/dswtzxx/bzxx/zj.vue

@@ -16,6 +16,7 @@
                 ref="rightContent"
         >
             <template #btnGroup="scope">
+                <el-button @click="edit(scope.scope)" type="text">修改</el-button>
                 <el-button @click="dele(scope.scope)" type="text">删除</el-button>
             </template>
         </right-content>
@@ -174,8 +175,8 @@
       },
       edit(scope) {
         this.$router.push({
-          path: "addryxx",
-          query: { rybh: scope.row.rybh, type: "xd" },
+          path: "bzxxAddzj",
+          query: { xxzjbh: scope.row.xxzjbh },
         });
       },
       dele(scope) {

src/views/dswtzxx/bzxx/zw.vue

@@ -16,6 +16,7 @@
                 ref="rightContent"
         >
             <template #btnGroup="scope">
+                <el-button @click="edit(scope.scope)" type="text">修改</el-button>
                 <el-button @click="dele(scope.scope)" type="text">删除</el-button>
             </template>
         </right-content>
@@ -171,13 +172,13 @@
       add(){
         this.$router.push({
           path: "bzxxAddzw",
-          query: { rybh: this.$route.query.rybh},
         });
       },
       edit(scope) {
+        console.log(scope);
         this.$router.push({
-          path: "addryxx",
-          query: { rybh: scope.row.rybh, type: "xd" },
+          path: "bzxxAddzw",
+          query: { xxzjbh: scope.row.xxzjbh },
         });
       },
       dele(scope) {