Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/caseFiling/archiveList.vue

@@ -144,7 +144,7 @@ export default {
       dataList: [],
       detailform: {}, //详情数据
       showarchiveDetails: false, //详情数据弹框
-      flagLoading: true, //详情弹框loading
+      flagLoading: false, //详情弹框loading
     };
   },
   created() {
@@ -177,7 +177,6 @@ export default {
     // model框显示
     showDetail(row) {
       this.getDetail({ id: row.id });
-      this.showarchiveDetails = true;
     },
     // 关闭弹窗
     cancelpaymentdetails() {
@@ -185,10 +184,9 @@ export default {
     },
     /** 查询详情 */
     getDetail(parms) {
-      this.flagLoading = true;
       adjudicationArchives(parms).then((res) => {
         this.detailform = res.data;
-        this.flagLoading = false;
+        this.showarchiveDetails = true;
       });
     },
   },

src/views/caseFiling/components/archiveDetailsDialog.vue

@@ -53,17 +53,6 @@ export default {
       noData: false,
     };
   },
-  watch: {
-    detailform: {
-      handler(val) {
-        if (val) {
-          this.caseApplicationObj = val.caseApplication;
-          this.caselogDataArr = val.caseLogRecordList;
-          this.deliveryDataArr = val.logisticsInfoVOList;
-        }
-      },
-    },
-  },
   methods: {
     handleClick(tab, event) {
       // console.log(tab, event);
@@ -72,6 +61,11 @@ export default {
       this.$emit("cancelpaymentdetails");
     },
   },
+  created() {
+    this.caseApplicationObj = this.detailform.caseApplication;
+    this.caselogDataArr = this.detailform.caseLogRecordList;
+    this.deliveryDataArr = this.detailform.logisticsInfoVOList;
+  },
 };
 </script>
 

src/views/caseFiling/components/expressDeliveryInfo.vue

@@ -50,30 +50,27 @@ export default {
   },
   created() {
     console.log(this.deliveryDataArr, "deliveryDataArr");
-    if ((this.deliveryDataArr && this.deliveryDataArr, length > 0)) {
+    if (this.deliveryDataArr && this.deliveryDataArr.length > 0) {
       this.deliveryDataArr.forEach((item) => {
         if (item.identityType == 1) {
           let applicantdata = item.logisticsInfo;
           this.applicantdelivery = JSON.parse(applicantdata);
-          this.expressOne = this.applicantdelivery;
-          console.log(this.expressOne, "this.expressOne");
-          if (this.expressOne.length > 0) {
-            this.expressOne.list.forEach((item) => {
+          if (this.applicantdelivery.list) {
+            this.applicantdelivery.list.forEach((item) => {
               item.content = item.datetime;
               item.timestamp = item.remark;
             });
+            this.expressOne = this.applicantdelivery;
           }
         } else {
           let applicantdata = item.logisticsInfo;
           this.applicantdelivery = JSON.parse(applicantdata);
           if (this.applicantdelivery.list) {
+            this.applicantdelivery.list.forEach((item) => {
+              item.content = item.datetime;
+              item.timestamp = item.remark;
+            });
             this.expressTwo = this.applicantdelivery;
-            if (this.expressOne.length > 0) {
-              this.expressTwo.forEach((item) => {
-                item.content = item.datetime;
-                item.timestamp = item.remark;
-              });
-            }
           }
         }
       });

src/views/caseManagement/components/caseentryDialog.vue

@@ -37,6 +37,8 @@
               <el-input
                 v-model="formData.caseSubjectAmount"
                 placeholder="请输入案件标的"
+                @keyup.native="InputNumber('caseSubjectAmount')"
+                autocomplete="off"
               />
             </el-form-item>
           </el-col>
@@ -860,6 +862,33 @@ export default {
     },
   },
   methods: {
+     // 过滤输入的金额
+    InputNumber (property) {
+      this.formData[property] = this.limitInputPointNumber(this.formData[property])
+    },
+ 
+    // 验证只能输入数字
+    limitInputNumber (val) {
+      if (val) {
+        return String(val).replace(/\D/g, '')
+      }
+      return val
+    },
+ 
+    // 限制只能输入数字(可以输入两位小数)
+    limitInputPointNumber (val) {
+      if (val === 0 || val === '0' || val === '') {
+        return ''
+      } else {
+        let value = null
+        value = String(val).replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符
+        value = value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
+        value = value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+        value = value.replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+        return Number(value)
+      }
+    },
+
     UploadUrl() {
       return window.location.origin + "/API/evidence/upload";
     },