doway-coms 1.1.85 → 1.1.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.1.85",
+  "version": "1.1.87",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -124,6 +124,8 @@
             size="small"
             @change="cellValueChange(scope)"
             v-model="scope.row[scope.column.property]"
+            :formatter="value => numberFormatter(value, scope)"
+            :parser="value => numberParse(value, scope)"
             :min="scope.column.numberMin"
             :max="scope.column.numberMax"
           />
@@ -1714,18 +1716,15 @@ export default {
     },
     setColumnEdit(field, edit) {
       for (let i = 0; i < this.internalColumns.length; i++) {
-        if (this.internalColumns[i].children) {
-          let colInfo = XEUtils.find(
-            this.internalColumns[i].children,
-            (p) => p.field === field
-          );
+        if (this.internalColumns[i].field == field) {
+          let colInfo = this.internalColumns[i]
           if (colInfo) {
-            colInfo.editRender.enabled = edit;
-            colInfo.params.edit = edit;
+            colInfo.editRender.enabled = edit
+            colInfo.params.edit = edit
           }
         }
       }
-      this.$refs.baseGrid.refreshColumn();
+      this.$refs.baseGrid.refreshColumn()
     },
     setEdit(currentState, currentStatus) {
       //设置添加按钮
@@ -2365,6 +2364,40 @@ export default {
         }, 10);
       }
     },
+    numberFormatter(value, scope){
+      return value
+    },
+    numberParse(value, scope){
+      if (scope.column.params.le) {
+        //小于等于
+        if (value > scope.row[scope.column.params.le]) {
+          return scope.row[scope.column.params.le]
+        }
+      }
+      let returnValue = value
+      let tempPrecision = XEUtils.toNumber(scope.column.params.precision)
+      let reg = new RegExp(
+        '^((-?)|(-?([1-9]{1}\\d*)|-?([0]{1})))(\\.(\\d){0,' + tempPrecision + '})?$'
+      )
+      if (!reg.test(value)) {
+        //小数点验证不通过
+        // console.debug('验证不通过')
+        returnValue = XEUtils.floor(value, tempPrecision)
+      }
+      if (
+        XEUtils.isInteger(scope.column.params.max) &&
+        XEUtils.toNumber(returnValue) > scope.column.params.max
+      ) {
+        returnValue = scope.column.params.max
+      }
+      if (
+        XEUtils.isInteger(scope.column.params.min) &&
+        XEUtils.toNumber(returnValue) < scope.column.params.min
+      ) {
+        returnValue = scope.column.params.min
+      }
+      return returnValue
+    }
   },
 };
 </script>

package/packages/utils/common.js

@@ -256,4 +256,222 @@ export function replaceParamString(
       } else {
         next()
       }
-  }
+  }
+
+  /**
+ * 供应商未税单价计算金额
+ * @param {行数据信息} rowInfo
+ * @param {税率} taxRate
+ * @param {数量字段} qtyField
+ * @param {未税单价字段} unitPriceNotTaxField
+ * @param {含税单价字段} unitPriceField
+ * @param {未税金额字段} amountNotTaxField
+ * @param {含税金额字段} amountField
+ * @param {税额字段} taxField
+ */
+export function supplyUnitPriceNotTaxAmount(rowInfo, taxRate, colInfo) {
+  //未税计算方式
+  //未税金额
+  rowInfo[colInfo.amountNotTaxField] = XEUtils.round(
+    XEUtils.multiply(
+      rowInfo[colInfo.qtyField],
+      rowInfo[colInfo.unitPriceNotTaxField]
+    ),
+    2
+  )
+  //税额
+  rowInfo[colInfo.taxField] = XEUtils.round(
+    XEUtils.multiply(rowInfo[colInfo.amountNotTaxField], taxRate),
+    2
+  )
+  //含税金额 = 未税金额+税额
+  rowInfo[colInfo.amountField] = XEUtils.add(
+    rowInfo[colInfo.amountNotTaxField],
+    rowInfo[colInfo.taxField]
+  )
+  //返回来计算含税单价
+
+  rowInfo[colInfo.unitPriceField] = XEUtils.round(
+    XEUtils.divide(rowInfo[colInfo.amountField], rowInfo[colInfo.qtyField]),
+    2
+  )
+  console.debug(rowInfo[colInfo.unitPriceField])
+
+  if (colInfo.direction) {
+    rowInfo[colInfo.taxField] = XEUtils.multiply(
+      rowInfo[colInfo.taxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountNotTaxField] = XEUtils.multiply(
+      rowInfo[colInfo.amountNotTaxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountField] = XEUtils.multiply(
+      rowInfo[colInfo.amountField],
+      colInfo.direction
+    )
+  }
+}
+
+/**
+ * 供应商含税单价计算金额
+ * @param {行数据信息} rowInfo
+ * @param {税率} taxRate
+ * @param {数量字段} qtyField
+ * @param {未税单价字段} unitPriceNotTaxField
+ * @param {含税单价字段} unitPriceField
+ * @param {未税金额字段} amountNotTaxField
+ * @param {含税金额字段} amountField
+ * @param {税额字段} taxField
+ */
+export function supplyUnitPriceAmount(rowInfo, taxRate, colInfo) {
+  //含税计算方式
+  rowInfo[colInfo.amountField] = XEUtils.round(
+    XEUtils.multiply(
+      rowInfo[colInfo.qtyField],
+      rowInfo[colInfo.unitPriceField]
+    ),
+    2
+  )
+  //未税金额 = 含税金额除以1.13
+  let tempValue = XEUtils.add(1, taxRate)
+  rowInfo[colInfo.amountNotTaxField] = XEUtils.round(
+    XEUtils.divide(rowInfo[colInfo.amountField], tempValue),
+    2
+  )
+  //税额 = 含税金额-未税金额
+  rowInfo[colInfo.taxField] = XEUtils.subtract(
+    rowInfo[colInfo.amountField],
+    rowInfo[colInfo.amountNotTaxField]
+  )
+  //未税单价
+  rowInfo[colInfo.unitPriceNotTaxField] = XEUtils.round(
+    XEUtils.divide(
+      rowInfo[colInfo.amountNotTaxField],
+      rowInfo[colInfo.qtyField]
+    ),
+    2
+  )
+
+  if (colInfo.direction) {
+    rowInfo[colInfo.taxField] = XEUtils.multiply(
+      rowInfo[colInfo.taxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountNotTaxField] = XEUtils.multiply(
+      rowInfo[colInfo.amountNotTaxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountField] = XEUtils.multiply(
+      rowInfo[colInfo.amountField],
+      colInfo.direction
+    )
+  }
+}
+
+/**
+ * 客户含税单价计算金额
+ * @param {行数据信息} rowInfo
+ * @param {税率} taxRate
+ * @param {数量字段} qtyField
+ * @param {未税单价字段} unitPriceNotTaxField
+ * @param {含税单价字段} unitPriceField
+ * @param {未税金额字段} amountNotTaxField
+ * @param {含税金额字段} amountField
+ * @param {税额字段} taxField
+ */
+export function custUnitPriceAmount(rowInfo, taxRate, colInfo) {
+  //含税计算方式
+  rowInfo[colInfo.amountField] = XEUtils.round(
+    XEUtils.multiply(
+      rowInfo[colInfo.qtyField],
+      rowInfo[colInfo.unitPriceField]
+    ),
+    2
+  )
+  //未税金额 = 含税金额除以1.13
+  let tempValue = XEUtils.add(1, taxRate)
+  rowInfo[colInfo.amountNotTaxField] = XEUtils.round(
+    XEUtils.divide(rowInfo[colInfo.amountField], tempValue),
+    2
+  )
+  //税额 = 含税金额-未税金额
+  rowInfo[colInfo.taxField] = XEUtils.subtract(
+    rowInfo[colInfo.amountField],
+    rowInfo[colInfo.amountNotTaxField]
+  )
+  //未税单价
+  rowInfo[colInfo.unitPriceNotTaxField] = XEUtils.round(
+    XEUtils.divide(
+      rowInfo[colInfo.amountNotTaxField],
+      rowInfo[colInfo.qtyField]
+    ),
+    store.getters.custPriceNotTaxPrecision
+  )
+  if (colInfo.direction) {
+    rowInfo[colInfo.taxField] = XEUtils.multiply(
+      rowInfo[colInfo.taxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountNotTaxField] = XEUtils.multiply(
+      rowInfo[colInfo.amountNotTaxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountField] = XEUtils.multiply(
+      rowInfo[colInfo.amountField],
+      colInfo.direction
+    )
+  }
+}
+/**
+ * 客户未税单价计算金额
+ * @param {行数据信息} rowInfo
+ * @param {税率} taxRate
+ * @param {数量字段} qtyField
+ * @param {未税单价字段} unitPriceNotTaxField
+ * @param {含税单价字段} unitPriceField
+ * @param {未税金额字段} amountNotTaxField
+ * @param {含税金额字段} amountField
+ * @param {税额字段} taxField
+ */
+export function custUnitPriceNotTaxAmount(rowInfo, taxRate, colInfo) {
+  //未税计算方式
+  //未税金额
+  rowInfo[colInfo.amountNotTaxField] = XEUtils.round(
+    XEUtils.multiply(
+      rowInfo[colInfo.qtyField],
+      rowInfo[colInfo.unitPriceNotTaxField]
+    ),
+    2
+  )
+  //税额
+  rowInfo[colInfo.taxField] = XEUtils.round(
+    XEUtils.multiply(rowInfo[colInfo.amountNotTaxField], taxRate),
+    2
+  )
+  //含税金额 = 未税金额+税额
+  rowInfo[colInfo.amountField] = XEUtils.add(
+    rowInfo[colInfo.amountNotTaxField],
+    rowInfo[colInfo.taxField]
+  )
+  //返回来计算含税单价
+  rowInfo[colInfo.unitPriceField] = XEUtils.round(
+    XEUtils.divide(rowInfo[colInfo.amountField], rowInfo[colInfo.qtyField]),
+    store.getters.custPricePrecision
+  )
+
+  if (colInfo.direction) {
+    rowInfo[colInfo.taxField] = XEUtils.multiply(
+      rowInfo[colInfo.taxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountNotTaxField] = XEUtils.multiply(
+      rowInfo[colInfo.amountNotTaxField],
+      colInfo.direction
+    )
+    rowInfo[colInfo.amountField] = XEUtils.multiply(
+      rowInfo[colInfo.amountField],
+      colInfo.direction
+    )
+  }
+}

package/packages/utils/enum.js

@@ -15,6 +15,9 @@ export const sysRowState = {
     week: 'week',
     month: 'month'
   }
+  export const industryVersion = {
+     paper:'paper'//纸箱行业
+  }
   export const controlType = {
     text: 'text',
     number: 'number', // 数字输入