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

src/views/ajbz/ajbzDetail.vue

@@ -1349,7 +1349,8 @@ export default {
       var self = this;
       if (self.textarea) {
         updateBzStatus({
-          htms: self.objCheck.czmsdm == 3 ? self.textarea : "",
+          // htms: self.objCheck.czmsdm == 3 ? self.textarea : "",
+          htms: self.textarea,
           czmsdm: self.objCheck.czmsdm,
           jjms: self.objCheck.czmsdm == 1 ? self.textarea : "",
           asjbh: self.asjbh,
@@ -1415,11 +1416,12 @@ export default {
         // debugger
         self.selectIndex1 = parseInt(res.data.rows.asjflzt);
         this.loadingIndex--;
-        if (res.data.rows.bzzt == "" && res.data.rows.czmsdm == 1) {
+        if ((res.data.rows.bzzt == "" || res.data.rows.bzzt == null ) && res.data.rows.jjms) {
           this.czmsdm1 = true;
           this.jjms = res.data.rows.jjms;
-        } else if (res.data.rows.bzzt == "" && res.data.rows.czmsdm == 3) {
+        } else if ((res.data.rows.bzzt == "" || res.data.rows.bzzt == null ) && res.data.rows.htms) {
           this.czmsdm3 = true;
+          debugger
           this.htms = res.data.rows.htms;
         }
         this.ajlbdm_str = res.data.rows.asjbzAjfl;

src/views/brainPhoto/brainWffzkycl.vue

@@ -282,7 +282,7 @@ export default {
         },
         {
           label: "可疑依据",
-          prop: "kyxshmKyyj",
+          prop: "kyxsjdcKyyj",
         },
 
         {