Merge remote-tracking branch 'origin/master'

zss

2023-12-15 619f774244a75d747878a9618e960bcede1a077b

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -288,7 +288,7 @@
  getObj,
  updateRawInsProduct,
  updateRawInspectsById,
  updateDeviceById, } from '@/api/quality/rawMaterial'
  updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
  import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
  import qrCodeApp from '@/views/common/qrCodeApp'
  export default {
@@ -321,7 +321,7 @@
                formTime: '',
                message: '',
                name: '',
                code: '88.118.1/A0498220',
                code: '',
                specs: '',
                unit: '',
                number: '',
@@ -345,7 +345,9 @@
              userName: '',
              testState: ''
            }],
            dataRule: {},
            dataRule: {
              code:[{ required: true, message: '请扫描选择零件', trigger: 'blur' }]
            },
            deviceList: [],
        }
    },
@@ -373,8 +375,11 @@
    },
    methods:{
      getResultInfo(data){
        // console.log("返回");
        console.log("扫描出的二维码值",data);
        console.log("扫描后执行");
        let obj=JSON.parse(data)
        let info={"code":obj["part_no"]}
        this.paramObj = info
        this.showPart = true
      },
      cancelCodeDialog(){
        this.qrcode = false