Merge remote-tracking branch 'origin/main'

src/views/smart/operationticketDetail.vue

@@ -395,7 +395,7 @@ export default {
                 prop: "securityMeasuresDisclosure",
                 type: "textarea",
                 span: 8,
-                maxlength: 1000,
+                maxlength: 300,
               },
               {
                 label: "作业后风险管控情况评价",
@@ -403,7 +403,7 @@ export default {
                 type: "textarea",
                 span: 8,
                 display: this.$route.query.frameMode == "add"? false : true,
-                maxlength: 1000,
+                maxlength: 300,
               },
               {
                 label: "状态",
@@ -850,6 +850,13 @@ export default {
       getDetail(this.$route.query.id).then(res => {
         console.log(res);
         this.tab1_form = res.data.data;
+        const charactersPerRow = 20;
+        let securityMeasuresDisclosureLen = res.data.data.securityMeasuresDisclosure.length;
+        let securityMeasuresDisclosureLenRows = Math.ceil(securityMeasuresDisclosureLen / charactersPerRow);
+        this.tab1_option.column[14].maxRows = securityMeasuresDisclosureLenRows;
+        let riskControlEvaluationLen = res.data.data.riskControlEvaluation.length;
+        let riskControlEvaluationLenRows = Math.ceil(riskControlEvaluationLen / charactersPerRow);
+        this.tab1_option.column[15].maxRows = riskControlEvaluationLenRows;
         switch (this.tab1_form.reviewStatus){
           case 1:
             this.form = "审核中";
@@ -996,4 +1003,7 @@ export default {
   outline: none;
   pointer-events: none;
 }
+.frame_class1 textarea {
+  overflow: hidden;
+}
 </style>

src/views/smart/workpermitDetail.vue

@@ -716,6 +716,15 @@
       SearchDetail() {
         getDetail(this.$route.query.id).then(res => {
           console.log(res);
+          const charactersPerRow = 20;
+          //延期申请理由
+          let extRegReasonLen = res.data.data.extRegReason.length;
+          let extRegReasonLenRows = Math.ceil(extRegReasonLen / charactersPerRow);
+          this.tab1_option.column[20].maxRows = extRegReasonLenRows;
+          //变更申请理由
+          let changeReasonLen = res.data.data.changeReason.length;
+          let changeReasonLenRows = Math.ceil(changeReasonLen / charactersPerRow);
+          this.tab1_option.column[22].maxRows = changeReasonLenRows;
           this.tab1_form = res.data.data;
           switch (this.tab1_form.checkStatus){
             case 1:
@@ -854,4 +863,9 @@
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */
 }
+
+.frame_class1 textarea {
+  overflow: hidden;
+}
+
 </style>