Merge remote-tracking branch 'origin/dev_ml_423'

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -346,13 +346,13 @@ export default {
           },
           { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.inputNumber },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, statistics: true },
-          {
-            title: '实际入库数量',
-            key: 'actualQuantityInStorage',
-            width: '120px',
-            type: FormTypes.inputNumber,
-            validateRules: [{ required: true, message: '实际入库数量不能为空' }],
-          },
+          // {
+          //   title: '实际入库数量',
+          //   key: 'actualQuantityInStorage',
+          //   width: '120px',
+          //   type: FormTypes.inputNumber,
+          //   validateRules: [{ required: true, message: '实际入库数量不能为空' }],
+          // },
           { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.input },
           { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.input },
           {

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -504,7 +504,7 @@ export default {
           },
           {
             title: '销售价',
-            key: 'wholesaleDecima',
+            key: 'wholesaleDecimal',
             width: '120px',
             type: FormTypes.input,
             validateRules: [{ required: true, message: '${title}不能为空' }],

jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -954,6 +954,7 @@ export default {
             commodityUnit = target?target.name : ''
           }else{
             commodityUnit = item.ratio
+            item.ratio = null
           }
           return {
             barCode: item.barCode,