Merge branch 'dev_ml_423' of http://121.40.253.172:3000/pengyue/jsh_erp into dev_huangjunjie

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

@@ -461,7 +461,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

@@ -853,9 +853,13 @@ export default {
       getAction(url, params)
         .then((res) => {
           const rows = (res.data.rows || []).map(item => {
-            if(this.unitChecked&&item.ratio){
-              const target = this.barCodeUnitList.find(unit => unit.ratio == item.ratio)
-              item.commodityUnit = target?target.name : ''
+            if(this.unitChecked){
+              if(item.ratio){
+                const target = this.barCodeUnitList.find(unit => unit.ratio == item.ratio)
+                item.commodityUnit = target?target.name : ''
+              }
+            }else{
+              item.ratio = item.commodityUnit // 回显单位
             }
             return item
           })

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

@@ -229,11 +229,16 @@ export default {
         .split(',')
         .filter((item) => item)
         .join(',')
-      this.getBatchData(str)
+        console.log('rows', rows)
+      getAction('/materialBatch/findBatchNumbersByBarCode',{
+        barCodes: str,
+      }).then((res) => {
+        this.getBatchData(res.data)
+      })
     },
     findAllSelect() {
-      const params = { ...this.$refs.selectModal.queryParam }
-      getAction('/material/findBatchNumbersBySelect', params).then((res) => {
+      // const params = { ...this.$refs.selectModal.queryParam }
+      getAction('/materialBatch/findBatchNumbersByBarCode').then((res) => {
         this.$refs.selectModal.close()
         this.getBatchData(res.data)
       })