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

@@ -549,13 +549,13 @@ export default {
           },
           { title: '价税合计', key: 'taxLastMoney', 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/material/modules/MaterialModal.vue

@@ -1373,11 +1373,13 @@ export default {
       } else {
         this.manySkuStatus = false
       }
+      console.log('onlyUnitOnChange=======',e.target.value)
       this.$refs.editableProBarCodeTable.getValues((error, values) => {
         let mArr = values
         for (let i = 0; i < mArr.length; i++) {
           let mInfo = mArr[i]
           mInfo.commodityUnit = e.target.value
+          mInfo.ratio = e.target.value
         }
         this.mbTable.dataSource = mArr
       })
@@ -1404,6 +1406,7 @@ export default {
         for (let i = 0; i < mArr.length; i++) {
           let mInfo = mArr[i]
           mInfo.commodityUnit = undefined
+          mInfo.ratio = undefined
         }
         this.mbTable.dataSource = mArr
       })

jshERP-web/src/views/stock/components/stockModal.vue

@@ -67,7 +67,7 @@
 <script>
 import editForm from './editForm.vue'
 import table from '../utils/table'
-import JSelectMaterialModal from '../../../components/jeecgbiz/modal/JSelectMaterialModal.vue'
+import JSelectMaterialModal from '../../../components/jeecgbiz/modal/JSelectMaterialModal2.vue'
 import { getAction, postAction } from '@/api/manage'
 import { getMaterialByBatchNumber } from '@/api/api'
 import { newTableMixin } from '@/mixins/newTableMixin'