Merge branch '1.1.10-9-8' into test

src/views/system/goods/add/index.vue

@@ -734,7 +734,7 @@
             this.goodsAllData.ladder = ladder
             // 进一步处理金额数据
             this.goodsAllData.ladder.map((item)=> {
-              item.money = formatNumber(item.money*100)
+              item.money =Number(this.cal.accMul(item.money,100))
               return item
             });
           }

src/views/system/warehouse/index.vue

 <template>
   <div class="app-container">
-    <el-card style="margin-bottom: 15px">
+    <el-card style="margin-bottom: 15px;height:auto;">
       <div slot="header">
         <span class="left-text">仓库管理</span>
       </div>
@@ -226,15 +226,15 @@
             ></el-input>
           </el-form-item>
           <el-form-item
-            label="仓库面积："
+            label="仓库面积："   
             prop="warehouse_area"
             inline-message="true"
           >
             <el-input
               v-model.trim="editForm.warehouse_area"
               style="width: 80%"
-              placeholder="请输入仓库面积（单位：m²）"
-            ></el-input>
+              placeholder="请输入仓库面积1~99999（单位：m²）"
+            ></el-input> m²
           </el-form-item>
           <el-form-item
             label="默认发货仓："
@@ -323,8 +323,8 @@ export default {
       const reg = /^[0-9]+(\.[0-9]{1,2})?$/;
       if (value === "") {
         callback(new Error("仓库面积不能为空"));
-      } else if (!reg.test(value)) {
-        callback(new Error("格式不对或只能保留两位小数"));
+      } else if (value<1&&value>99999) {
+        callback(new Error("仓库面积超出最大限制，请重新输入(支持1～99999)"));
       } else {
         callback();
       }