暂存

src/components/globalComponents/show-data-table/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

src/components/globalComponents/show-data-table/main.vue

@@ -0,0 +1,104 @@
+<template>
+  <div class="show-data-table">
+    <el-row class="purchaseOrderDetail-addForm">
+      <el-col
+        :span="colu.span || 12"
+        class="purchaseOrderDetail-addForm-el-col"
+        v-for="(colu, index) in columns"
+        :key="colu + index"
+      >
+        <div class="label">{{ colu.label }}：</div>
+        <div class="name" v-if="colu._slot_">
+          <slot
+            :name="colu._slot_"
+            :slotName="colu._slot_"
+          ></slot>
+        </div>
+        <div class="name" v-else>{{ sitem[colu.prop] }}</div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "showDataTable",
+
+  props: {
+    newTime: {
+      type: String,
+      default: "",
+    },
+    sitem: {
+      type: Object,
+      default: () => {},
+    },
+    /**
+     * el-table-column 表格字段设置集合
+     * 自定义属性：
+     * @param {String}       _slot_       : 插槽名
+     * @param {Number}       span         : 布局设置 默认12
+     * @param {String}       prop         : 字段名
+     * @param {String}       label        : 字段含义
+     */
+    columns: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  computed: {},
+  data() {
+    return {
+      lodding: false,
+    };
+  },
+  watch: {
+     newTime: function (val) {
+      if (val) {
+        // this.initForm();
+      }
+    },
+  },
+  mounted() {},
+
+  methods: {},
+};
+</script>
+
+
+
+<style lang="scss" scoped>
+.show-data-table {
+  padding:0 0 20px 0;
+  .purchaseOrderDetail-addForm {
+    border-top: 1px solid #ebeef5 !important;
+    border-left: 1px solid #ebeef5 !important;
+    .purchaseOrderDetail-addForm-el-col {
+      display: flex;
+      align-items: stretch;
+      //
+      border-right: 1px solid #ebeef5 !important;
+      .label {
+        width: 145px;
+        line-height: 40px;
+        text-align: right;
+        background: #fafafa !important;
+        font-weight: 400 !important;
+        color: #909399 !important;
+        font-size: 12px !important;
+        border-bottom: 1px solid #ebeef5 !important;
+        border-right: 1px solid #ebeef5 !important;
+      }
+      .name {
+        width: calc(100% - 145px);
+        text-align: left;
+        line-height: 40px;
+        font-size: 12px !important;
+        border-bottom: 1px solid #ebeef5 !important;
+        padding: 0 0 0 12px !important;
+        color: #606266 !important;
+      }
+    }
+  }
+}
+</style>

src/utils/validate.js

@@ -192,7 +192,7 @@ export function isnumber(s) {
  * @param {*} s
  */
 export function isnumber2(s) {
-  return /^(([^0][0-9]+|0)\.([0-9]{1,2})$)|^([^0][0-9]+|0)$/.test(s)
+  return /(^[0-9]{1,2}$)|(^[0-9]{1,2}[\.]{1}[0-9]{1,2}$)/.test(s)
 }
 /**
  * 数字或者带小数点的数字 1,2,3位小数

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -305,6 +305,7 @@ export default {
         this.tableData.forEach((v) => {
           v.class_cat = "";
           if (v.can && v.can.length > 0) {
+            v.class_cat=""
             v.can.forEach((x, i) => {
               v.class_cat += i === 0 ? x.name : "/" + x.name;
             });

src/views/purchaseIn/purchaseOrder/components/columns.js → src/views/purchaseIn/purchaseOrder/components/ShowDataTableColumns.js

@@ -8,14 +8,14 @@ export default  [
       prop: "bkcode",
       label: "备库单编号",
     },
-    {
-      prop: "cgder",
-      label: "申请人",
-    },
-    {
-      prop: "good_code",
-      label: "商品编号",
-    },
+    // {
+    //   prop: "cgder",
+    //   label: "申请人",
+    // },
+    // {
+    //   prop: "good_code",
+    //   label: "商品编号",
+    // },
     {
       prop: "good_type_code",
       label: "商品属性编号",
@@ -42,29 +42,25 @@ export default  [
     },
 
     {
-      prop: "goods_class",
+      prop: "class_cat",
       label: "商品分类",
     },
     {
       prop: "status",
-      label: "状态",
+      label: "采购单状态",
       _slot_: "status",
     },
-    {
-      prop: "addtime",
-      label: "创建时间",
-    },
     {
       prop: "good_price",
-      label: "单价",
+      label: "采购单价",
     },
     {
       prop: "good_num",
-      label: "数量",
+      label: "采购总数量",
     },
     {
       prop: "total_fee",
-      label: "总货款",
+      label: "采购总成本",
     },
 
     {
@@ -80,5 +76,10 @@ export default  [
       prop: "lasttime",
       label: "预计最晚入库时间",
     },
+    
+    {
+      prop: "addtime",
+      label: "创建时间",
+    },
   ]
   

src/views/purchaseIn/purchaseOrder/components/order-addEdit.vue

@@ -1,103 +0,0 @@
-<template>
-
-    <el-row class="purchaseOrderDetail-addForm">
-      <el-col
-        :span="12"
-        class="purchaseOrderDetail-addForm-el-col"
-        v-for="(colu, index) in columns"
-        :key="colu + index"
-      >
-        <div class="label">{{ colu.label }}：</div>
-        <div class="name">{{ sitem[colu.prop] }}</div>
-      </el-col>
-    </el-row>
-
-</template>
-   <script>
-// import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
-
-import columns from "./columns";
-export default {
-  name: "addEdit",
-  props: ["id", "sitem", "newTime"],
-  data() {
-    return {
-      columns: columns,
-      status: "",
-      loading: false,
-
-      isDisabled: false,
-      detailSitem: null,
-      loading: false,
-      modelId: "",
-      sitem: null,
-      showModel: false,
-      isDetail: false,
-      modelId: 0,
-    };
-  },
-  mounted() {
-    this.initForm();
-  },
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
-  methods: {
-    
-   
-
-    async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.status = "";
-      } else {
-        const { status, can } = this.sitem;
-        this.sitem.goods_class = "";
-        this.status = status || "";
-        can.forEach((v, i) => {
-          this.sitem.goods_class += i === 0 ? v.name : "/" + v.name;
-        });
-      }
-      this.loading = false;
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.purchaseOrderDetail-addForm {
-  border-top: 1px solid #ebeef5 !important;
-  border-left: 1px solid #ebeef5 !important;
-  .purchaseOrderDetail-addForm-el-col {
-    display: flex;
-    align-items: stretch;
-    //
-    border-right: 1px solid #ebeef5 !important;
-    .label {
-      width: 145px;
-      line-height: 40px;
-      text-align: right;
-      background: #fafafa !important;
-      font-weight: 400 !important;
-      color: #909399 !important;
-      font-size: 12px !important;
-      border-bottom: 1px solid #ebeef5 !important;
-      border-right: 1px solid #ebeef5 !important;
-    }
-    .name {
-      width: calc(100% - 145px);
-      text-align: left;
-      line-height: 40px;
-      font-size: 12px !important;
-      border-bottom: 1px solid #ebeef5 !important;
-      padding: 0 0 0 12px !important;
-      color: #606266 !important;
-    }
-  }
-}
-</style>
-   

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -79,14 +79,26 @@
       />
       <el-collapse v-model="activeNames">
         <el-collapse-item title="采购单信息" name="1">
-          <order-addEdit
-            style="padding: 0 0 20px 0"
+          <show-data-table
             :newTime="newTime"
             v-if="newTime !== ''"
             :sitem="sitem"
-            :id="queryId"
-            @refresh="initData()"
-          />
+            :columns="ShowDataTableColumns"
+          >
+            <template slot="status">
+              <el-tag
+                :size="'mini'"
+                :type="sitem.status == '0' ? 'warning' : ''"
+                v-text="
+                  (
+                    statusOptions.find((item) => item.value == sitem.status) ||
+                    {}
+                  ).label || '--'
+                "
+              ></el-tag>
+            </template>
+          </show-data-table>
+
           <!-- <work-diff-table></work-diff-table> -->
         </el-collapse-item>
         <el-collapse-item title="备货入库单" name="2">
@@ -137,8 +149,8 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
-import orderAddEdit from "./components/order-addEdit";
 import orderInTable from "./components/order-in-table";
+import ShowDataTableColumns from "./components/ShowDataTableColumns";
 // import diffOrderAdd from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
 // import WorkDiffTable from "./components/workDiff-table.vue";
 import orderAddeditModel from "./components/order-addedit-model";
@@ -147,13 +159,11 @@ export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
-    orderAddEdit,
     orderInTable,
-    // diffOrderAdd,
     orderAddeditModel,
-    // WorkDiffTable,
     PurchaseReturnAdd, //采购单退货弹窗
   },
+
   computed: {
     powers() {
       let tran =
@@ -172,7 +182,7 @@ export default {
       detailSitem: null,
       modelId: "",
       showModel: false,
-
+      ShowDataTableColumns: ShowDataTableColumns,
       isMetal: false,
       finishStatus: "finish",
       activeNames: ["0", "1", "2", "3", "4", "5", "10"],
@@ -241,6 +251,12 @@ export default {
         const { status, can } = this.sitem;
         this.status = status;
         this.orderCode = res.data.cgdNo;
+        if (can && can.length > 0) {
+           this.sitem.class_cat =""
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/purchaseIn/purchaseReturn/ShowDataTableColumns.js

@@ -0,0 +1,75 @@
+export default  [
+  {
+    prop: "returnCode",
+    label: "采购退货单编号",
+  },
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+  },
+  {
+    prop: "apply_name",
+    label: "申请人"
+  },
+  {
+    prop: "good_code",
+    label: "商品编码",
+  },
+  {
+    prop: "goods_class",
+    label: "商品分类",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+  },
+  {
+    prop: "goo_num",
+    label: "商品数量",
+  },
+
+
+  {
+    prop: "return_num",
+    label: "退货数量",
+  },
+
+  // {
+  //   prop: "good_price",
+  //   label: "商品单价",
+  // },
+  {
+    prop: "good_total",
+    label: "退货总金额",
+  },
+  {
+    prop: "post_company",
+    label: "物流公司",
+  },
+  {
+    prop: "post_code",
+    label: "物流编号",
+  },
+  {
+    prop: "post_fee",
+    label: "物流费",
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+  },
+  {
+    prop: "remark",
+    label: "备注"
+  },
+  {
+    prop: "wsm_supplier",
+    label: "供应商"
+  },
+  {
+    prop: "wsm_supplierNo",
+    label: "供应商编码"
+  },
+  ]
+  

src/views/purchaseIn/purchaseReturn/detail.vue

@@ -3,8 +3,37 @@
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      {{ status }}--{{ powers }}
-      <el-button
+      <p>{{ status }}--{{ powers }}</p>
+
+      <div class="detail-page-title">
+        <span>采购退货单编号：</span
+        ><span v-if="sitem">{{ sitem.bk_code }}</span>
+
+        <el-button
+          v-if="
+            powers.some((item) => item === '015') &&
+            (status === '0' || status === '1' || status === '2')
+          "
+          @click="statusConfirm('-1', '作废该条信息')"
+          type="danger"
+          plain
+          class="fr"
+          :size="'mini'"
+          style="margin: 0 0 0 12px"
+          >作废该条信息</el-button
+        >
+        <el-button
+          @click="statusConfirm('0', '取消审核流程')"
+          plain
+          class="fr"
+          type="primary"
+          :size="'mini'"
+          v-if="status === '1' && powers.some((item) => item == '014')"
+          >取消备货申请</el-button
+        >
+      </div>
+
+      <!-- <el-button
         @click="statusConfirm('-1', '作废该条信息')"
         type="danger"
         plain
@@ -16,7 +45,8 @@
           powers.some((item) => item == '015')
         "
         >作废该条信息</el-button
-      >
+
+      > -->
       <status-bar
         v-if="newTime !== '' && status !== '4'"
         :newTime="newTime"
@@ -38,14 +68,33 @@
         v-if="status != '0'"
       >
         <el-collapse-item title="采购退货单信息" name="0">
-          <purchase-order-addEdit
+          <show-data-table
+            :newTime="newTime"
+            v-if="newTime !== ''"
+            :sitem="sitem"
+            :columns="ShowDataTableColumns"
+          >
+            <template slot="status">
+              <el-tag
+                :size="'mini'"
+                :type="sitem.status == '0' ? 'warning' : ''"
+                v-text="
+                  (
+                    statusOptions.find((item) => item.value == sitem.status) ||
+                    {}
+                  ).label || '--'
+                "
+              ></el-tag>
+            </template>
+          </show-data-table>
+          <!-- <purchase-order-addEdit
             style="padding: 0 0 20px 0"
             :newTime="newTime"
             v-if="newTime !== ''"
             :sitem="sitem"
             :id="queryId"
             @refresh="initData()"
-          />
+          /> -->
         </el-collapse-item>
 
         <el-collapse-item
@@ -107,18 +156,15 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseReturn";
-// import addEdit from "./components/addEdit";
+import ShowDataTableColumns from "./ShowDataTableColumns";
 import { mapGetters } from "vuex";
-// import PurchaseBack from "./components/purchaseBack.vue";
-import PurchaseOrderAddEdit from "./components/purchase-order-addEdit.vue";
+// import PurchaseOrderAddEdit from "./components/purchase-order-addEdit.vue";
 
 export default {
   name: "purchaseReturnDetail",
   mixins: [mixinPage, resToken],
   components: {
-    // addEdit,
-    // PurchaseBack,
-    PurchaseOrderAddEdit,
+    // PurchaseOrderAddEdit,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
@@ -137,7 +183,7 @@ export default {
   data() {
     return {
       orderCode: "",
-
+      ShowDataTableColumns: ShowDataTableColumns,
       activeNames: ["0", "1", "2", "3", "4", "10"],
       newTime: "",
       queryId: "",
@@ -146,7 +192,7 @@ export default {
       status: "",
       statusOptions: [
         // { value: "0", label: "取消" },
-        { value: "1", label: "发起业务审核" },
+        { value: "1", label: "待业务审核" },
         { value: "2", label: "通知财务部门" },
         { value: "3", label: "采购退货成功" },
       ],
@@ -206,8 +252,7 @@ export default {
           title: message + "成功！",
           message: "",
         });
-
-        this.routeGoto("storeManage", {});
+        this.routeGoto("purchaseReturn", {});
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
@@ -228,7 +273,7 @@ export default {
           title: message + "成功！",
           message: "",
         });
-       await  this.initData();
+        await this.initData();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {

src/views/purchaseIn/wsmInOrder/components/ShowDataTableColumns.js

@@ -0,0 +1,97 @@
+export default [
+  {
+    prop: "wsm_in_code",
+    label: "备货入库单编号",
+  },
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+  },
+  // {
+  //   prop: "cgder",
+  //   label: "申请人",
+  // },
+  {
+    prop: "good_type_code",
+    label: "商品属性编号",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+  },
+  {
+    prop: "wsm_supplierNo",
+    label: "仓库供应商编号",
+  },
+  {
+    prop: "wsm_supplier",
+    label: "仓库供应商名称",
+  },
+  {
+    prop: "wsm_code",
+    label: "仓库编号",
+  },
+  {
+    prop: "wsm_name",
+    label: "仓库名称",
+  },
+
+  {
+    prop: "wsm_reaper",
+    label: "仓库接收人",
+  },
+  {
+    prop: "class_cat",
+    label: "商品分类",
+  },
+  {
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+  },
+  // {
+  //   prop: "good_price",
+  //   label: "采购单价",
+  // },
+  {
+    prop: "good_num",
+    label: "采购总数量",
+  },
+  // {
+  //   prop: "total_fee",
+  //   label: "采购总成本",
+  // },
+
+  {
+    prop: "send_num",
+    label: "入库数量",
+  },
+  {
+    prop: "post_company",
+    label: "快递公司",
+  },
+  {
+    prop: "post_code",
+    label: "快递编号",
+  },
+
+  {
+    prop: "post_fee",
+    label: "快递费用",
+  },
+  {
+    prop: "apply_name",
+    label: "发货人",
+  },
+  {
+    prop: "sendtime",
+    label: "发货时间",
+  },
+
+  
+  {
+    prop: "addtime",
+    label: "创建时间",
+  },
+]
+

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -4,34 +4,47 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      {{ status }}---{{ powers}}
+      <p>{{ status }}---{{ powers}}</p>
+
+        <div class="detail-page-title">
+        <span class="title">备货入库单编号：{{ queryId }}</span>
+      </div>
       <status-bar
         v-if="newTime !== ''"
         :newTime="newTime"
         :options="statusOptions"
         :status="status"
       />
-      <div class="detail-page-title">
-        <span class="title">备货入库单编号：{{ queryId }}</span>
-        <span class="fr">
-          <el-tag>
-            {{
-              (statusList.find((item) => item.code == status) || {}).label ||
-              "--"
-            }}
-          </el-tag>
-        </span>
-      </div>
+    
       <el-collapse v-model="activeNames">
-        <el-collapse-item title="入库单发货信息" name="0">
-          <wsm-in-order-addEdit-form
+        <el-collapse-item title="备货入库单信息" name="0">
+              <show-data-table
+            :newTime="newTime"
+            v-if="newTime !== ''"
+            :sitem="sitem"
+            :columns="ShowDataTableColumns"
+          >
+            <template slot="status">
+              <el-tag
+                :size="'mini'"
+                :type="sitem.status == '0' ? 'warning' : ''"
+                v-text="
+                  (
+                    statusOptions.find((item) => item.value == sitem.status) ||
+                    {}
+                  ).label || '--'
+                "
+              ></el-tag>
+            </template>
+          </show-data-table>
+          <!-- <wsm-in-order-addEdit-form
             v-if="newTime !== ''"
             :id="queryId"
             :newTime="newTime"
             :modelSitem="{}"
             :sitem="sitem"
             @refresh="initData()"
-          />
+          /> -->
         </el-collapse-item>
         <el-collapse-item
           title="入库验收"
@@ -107,7 +120,7 @@ import wsmInOrderAddEditForm from "./components/wsm-in-order-addEdit-form";
 import wsmInOrderRecordForm from "./components/wsm-in-order-record-form";
 import wsmInOrderCheckForm from "./components/wsm-in-order-check-form";
 import wsmInOrderReturnForm from "./components/wsm-in-order-return-form";
-
+import ShowDataTableColumns from "./components/ShowDataTableColumns";
 export default {
   name: "wsmInOrderDetail",
   mixins: [resToken],
@@ -133,6 +146,7 @@ export default {
   data() {
     return {
       orderCode: "",
+        ShowDataTableColumns: ShowDataTableColumns,
       activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
       status: "",
@@ -213,9 +227,16 @@ export default {
     async initData() {
       const res = await asyncRequest.orderininfo({ wsm_in_code: this.queryId });
       if (res && res.code === 0 && res.data) {
-        this.sitem = res.data;
-        this.status = this.sitem.status;
-        this.orderCode = res.data.wsm_in_code;
+         this.sitem = res.data;
+        const { status, can,wsm_in_code } = this.sitem;
+        this.status = status;
+        this.orderCode = wsm_in_code;
+         if (can && can.length > 0) {
+           this.sitem.class_cat =""
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/sellOut/salesOrder/components/feedback-form.vue

@@ -100,7 +100,7 @@
       </el-col>
       <el-col
         :span="24"
-        style="text-align: right;padding:0 0 20px 0;"
+        style="text-align: right; padding: 0 0 20px 0"
         v-if="status === '1' && powers.some((item) => item == '033')"
       >
         <el-button :size="'mini'" type="primary" @click="submitForm"
@@ -115,7 +115,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
 import searchStockGoodModal from "@/components/search-stock-good-modal";
-import { isnumber2 } from "@/utils/validate";
+import { isnumber, isnumber2 } from "@/utils/validate";
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
@@ -147,10 +147,12 @@ export default {
       if (value === "") {
         callback(new Error("物流费用不能为空"));
       } else {
-        if (!isnumber2(value)) {
-          callback(new Error("物流费用仅支持整数或两位小数!"));
-        } else {
+        if (isnumber()) {
+          callback();
+        } else if (isnumber2(value)) {
           callback();
+        } else {
+          callback(new Error("物流费用仅支持整数或两位小数!"));
         }
       }
     };

src/views/sellOut/salesOrder/components/out-order-add-model.vue

@@ -47,7 +47,7 @@
         <el-col :span="24">
           <el-divider>选择收货地址</el-divider>
         </el-col>
-        <el-col :span="24" style="padding:0 0 20px 0">
+        <el-col :span="24" style="padding: 0 0 20px 0">
           <el-table
             ref="multipleTable"
             :data="tableData1"
@@ -144,7 +144,9 @@ export default {
       if (value === "") {
         callback(new Error("不能为空！"));
       } else {
-        if (isnumber2(value)) {
+        if (isnumber(value)) {
+          callback();
+        } else if (isnumber2(value)) {
           callback();
         } else {
           callback(new Error("仅支持整数或两位小数!"));

src/views/sellOut/sellAfterApply/components/returnExpress.vue

@@ -124,7 +124,7 @@ export default {
         },
         {
           value: "2",
-          label: "公司承担",
+          label: "购买方公司承担",
         },
       ],
       code: "",

src/views/sellOut/sellAfterApply/detail.vue

@@ -34,7 +34,7 @@
         <el-collapse-item
           title="业务审核"
           name="1"
-          v-if="status === '0' && powers.some((item) => item == '034')"
+          v-if="status === '1' && powers.some((item) => item == '034')"
         >
           <exam-form
             :statusList="statusList"

src/views/sheetOrder/zxOrder/components/feedback-form.vue

@@ -147,10 +147,12 @@ export default {
       if (value === "") {
         callback(new Error("物流费用不能为空"));
       } else {
-        if (!isnumber2(value)) {
-          callback(new Error("物流费用仅支持整数或两位小数!"));
-        } else {
+        if (isnumber(value)) {
+          callback();
+        } else if (isnumber2(value)) {
           callback();
+        } else {
+          callback(new Error("物流费用仅支持整数或两位小数!"));
         }
       }
     };