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

src/components/ptCxForm_components.vue

@@ -800,11 +800,11 @@
                 (columnTitle.prop == 'wzsz' ||
                   columnTitle.prop == 'zrzy' ||
                   columnTitle.prop == 'bhrcs' ||
-                  columnTitle.prop == 'gshbbbj' ||
+                  columnTitle.prop == 'xyrgs' ||
                   columnTitle.prop == 'jdjl' ||
-                  columnTitle.prop == 'kcjcbl' ||
-                  columnTitle.prop == 'stzldzsj' ||
-                  columnTitle.prop == 'qt') &&
+                  columnTitle.prop == 'kcbl' ||
+                  columnTitle.prop == 'stzl' ||
+                  columnTitle.prop == 'qtcl') &&
                 pageBs == 'queryZjcl'
               "
             >

src/views/zjcl/jcgz/addZjclLb.vue

@@ -40,10 +40,10 @@
               {
                 name: "证据类别描述:",
                 id: "description",
-                type: "text",
+                type: "textarea",
                 value: "",
                 placeholder: "请输入",
-                col: "2",
+                col: "22",
                 prop:'checkEmpty'
               },
             ],

src/views/zjcl/zjclcl/queryZjcl.vue

@@ -187,7 +187,7 @@ export default {
         },
         {
           label: "犯罪嫌疑人供述和辩解",
-          prop: "gshbbbj",
+          prop: "xyrgs",
         },
         {
           label: "鉴定结论",
@@ -195,15 +195,15 @@ export default {
         },
         {
           label: "勘查/检查笔录",
-          prop: "kcjcbl",
+          prop: "kcbl",
         },
         {
           label: "视听资料以及电子数据",
-          prop: "stzldzsj",
+          prop: "stzl",
         },
         {
           label: "其他",
-          prop: "qt",
+          prop: "qtcl",
         },
       ],
       cxUrl: "/zjclJc/getAsjZjjcList",