完善商品可设置4位小数

8 months ago · 94549b32a2
12 changed files with 22 additions and 22 deletions
--- a/src/views/goods/goods/goodsAdd.vue
+++ b/src/views/goods/goods/goodsAdd.vue
@ -562,7 +562,7 @@
              <el-form-item>
                <el-input v-model="itemInfo.finalPurchasePrice" placeholder="最后采购价" clearable
                  class="addinputw addinputInfo"
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
              </el-form-item>
            </el-col>

@ -622,7 +622,7 @@
              <div class="span-sty">成本价</div>
              <el-form-item>
                <el-input v-model="itemInfo.costPrice" placeholder="成本价" clearable class="addinputw addinputInfo"
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
              </el-form-item>
            </el-col>

@ -630,7 +630,7 @@
              <div class="span-sty">吊牌价</div>
              <el-form-item>
                <el-input v-model="itemInfo.tagPrice" placeholder="吊牌价" clearable class="addinputw addinputInfo"
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
              </el-form-item>
            </el-col>

@ -638,7 +638,7 @@
              <div class="span-sty">销售单价</div>
              <el-form-item>
                <el-input v-model="itemInfo.salesPrice" placeholder="销售单价" clearable class="addinputw addinputInfo"
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
              </el-form-item>
            </el-col>

@ -651,7 +651,7 @@
              <el-form-item>
                <el-input v-model="itemInfo.standardPurchasePrice" placeholder="标准进价" clearable
                  class="addinputw addinputInfo"
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
              </el-form-item>
            </el-col>

@ -659,7 +659,7 @@
              <div class="span-sty">代理价</div>
              <el-form-item>
                <el-input v-model="itemInfo.agencyPrice" placeholder="代理价" clearable class="addinputw addinputInfo"
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
              </el-form-item>
            </el-col>

@ -679,7 +679,7 @@
              <el-form-item>
                <el-input v-model="itemInfo.minimumSalesPrice" placeholder="最低零售价" clearable
                  class="addinputw addinputInfo"
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
              </el-form-item>
            </el-col>

--- a/src/views/inStorage/inspectionGoods/inspectionGoodsAdd.vue
+++ b/src/views/inStorage/inspectionGoods/inspectionGoodsAdd.vue
@ -85,7 +85,7 @@
            <el-table-column label="商品数量" align="center" width="120">
              <template slot-scope="scope">
                <el-input ref="focusAssumptionInput" v-model="scope.row.count" clearable placeholder=""
-                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
                  @input="commodityComputeYHAndXSJE(scope.row,$event)" />
              </template>
            </el-table-column>
--- a/src/views/inStorage/receivingGoods/inStorageAdd.vue
+++ b/src/views/inStorage/receivingGoods/inStorageAdd.vue
@ -52,7 +52,7 @@
            <template slot-scope="scope">
              <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE1(scope.row)"
                v-model="scope.row.price" clearable placeholder=""
-                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
            </template>
          </el-table-column>
          <el-table-column label="总价" prop="totalPrice" align="center" />
@ -63,7 +63,7 @@
            <template slot-scope="scope">
              <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE2(scope.row)"
                v-model="scope.row.count" clearable placeholder=""
-                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
            </template>
          </el-table-column>
          <el-table-column label="生产批次号" prop="batch" align="center" />
--- a/src/views/outStorage/alreadyOutStorage/index.vue
+++ b/src/views/outStorage/alreadyOutStorage/index.vue
@ -345,7 +345,7 @@
        <el-table-column label="分配数量" align="center" min-width="200">
          <template slot-scope="scope">
            <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
          </template>
        </el-table-column>
      </el-table>
--- a/src/views/outStorage/toAllocated/index.vue
+++ b/src/views/outStorage/toAllocated/index.vue
@ -344,7 +344,7 @@
        <el-table-column label="分配数量" align="center" min-width="200">
          <template slot-scope="scope">
            <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
          </template>
        </el-table-column>
      </el-table>
--- a/src/views/outStorage/toOutStorage/index.vue
+++ b/src/views/outStorage/toOutStorage/index.vue
@ -345,7 +345,7 @@
        <el-table-column label="分配数量" align="center" min-width="200">
          <template slot-scope="scope">
            <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
          </template>
        </el-table-column>
      </el-table>
--- a/src/views/outStorage/zeroPicking/index.vue
+++ b/src/views/outStorage/zeroPicking/index.vue
@ -345,7 +345,7 @@
        <el-table-column label="分配数量" align="center" min-width="200">
          <template slot-scope="scope">
            <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
          </template>
        </el-table-column>
      </el-table>
--- a/src/views/storage/inventoryAdjust/inventoryAdjust/inventoryAdjustAdd.vue
+++ b/src/views/storage/inventoryAdjust/inventoryAdjust/inventoryAdjustAdd.vue
@ -209,7 +209,7 @@
        value = value.replace(/(-)0+(\d+)/g, '$1$2') // 不能出现-01,-02类似
        value = value.replace(/^0+(\d)/, '$1') // 第一位0开头，0后面为数字，则过滤掉，取后面的数字
        value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15位整数
-        value = value.replace(/(\.\d{3})\d*/, '$1') // 最多保留2位小数
+        value = value.replace(/(\.\d{4})\d*/, '$1') // 最多保留4位小数
        return value
      },
      showAdd() {
--- a/src/views/storage/inventoryAdjust/inventoryDifferential/inventoryDifferential.vue
+++ b/src/views/storage/inventoryAdjust/inventoryDifferential/inventoryDifferential.vue
@ -232,7 +232,7 @@
        value = value.replace(/(-)0+(\d+)/g, '$1$2') // 不能出现-01,-02类似
        value = value.replace(/^0+(\d)/, '$1') // 第一位0开头，0后面为数字，则过滤掉，取后面的数字
        value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15位整数
-        value = value.replace(/(\.\d{3})\d*/, '$1') // 最多保留2位小数
+        value = value.replace(/(\.\d{4})\d*/, '$1') // 最多保留4位小数
        return value
      },
      // 搜索条件效果
--- a/src/views/storage/inventoryWarning/regionalWarning/regionalWarning.vue
+++ b/src/views/storage/inventoryWarning/regionalWarning/regionalWarning.vue
@ -80,7 +80,7 @@
                <template slot-scope="scope">
                  <el-input ref="" v-model="scope.row.alertUpperLimit" clearable placeholder=""
                    @change="itemRemarks(scope.row)"
-                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
                </template>
              </el-table-column>

@ -88,7 +88,7 @@
                <template slot-scope="scope">
                  <el-input ref="" v-model="scope.row.warningLowerLimit" clearable placeholder=""
                    @change="itemRemarks(scope.row)"
-                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />

                </template>
              </el-table-column>
@ -123,13 +123,13 @@
            <div class="span-sty"><span class="must">*</span> 可用上限</div>
            <el-form-item prop="alertUpperLimit"><el-input v-model="formobj.alertUpperLimit"
                class="addinputInfo addinputw" clearable placeholder=""
-                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /></el-form-item>
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /></el-form-item>
          </el-col>
          <el-col :span="12">
            <div class="span-sty"><span class="must">*</span> 可用下限</div>
            <el-form-item prop="warningLowerLimit"><el-input v-model="formobj.warningLowerLimit"
                class="addinputInfo addinputw" clearable placeholder=""
-                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /></el-form-item>
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /></el-form-item>
          </el-col>
        </el-row>
      </el-form>
--- a/src/views/system/roleAdminister/roleAdminister.vue
+++ b/src/views/system/roleAdminister/roleAdminister.vue
@ -488,7 +488,7 @@
    mounted() {
      this.formBackup = Object.assign({}, this.roleForm)
      this.getroleOrgList()
-      this.getPostList()
+      // this.getPostList()
      // this.getType()
    },
    methods: {
--- a/src/views/system/userManage/userManageList.vue
+++ b/src/views/system/userManage/userManageList.vue
@ -295,7 +295,7 @@
    mounted() {
      this.getOrgUserList()
      this.getRoleList()
-      this.getOrgTree()
+      // this.getOrgTree()
      // this.getOrgList()

    },