Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into test

src/views/material/BOMmanage/components/detailedList.vue

@@ -693,8 +693,11 @@
             newVal.slice(firstDotIndex + 1).replace(/\./g, '');
         }
 
+        const match = newVal.match(/^(\d+)(\.\d{0,4})?/);
+        item.dosage = match ? match[0] : '';
+
         // 4. 更新数据
-        item.dosage = newVal;
+        // item.dosage = newVal;
       },
 
       factoriesFn(code) {

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -1431,8 +1431,11 @@
             newVal.slice(firstDotIndex + 1).replace(/\./g, '');
         }
 
+        const match = newVal.match(/^(\d+)(\.\d{0,4})?/);
+        item.count = match ? match[0] : '';
+
         // 4. 更新数据
-        item.count = newVal;
+        // item.count = newVal;
       },
 
       async detailsList() {