Merge remote-tracking branch 'origin/master'

zss

2023-12-15 619f774244a75d747878a9618e960bcede1a077b

Merge remote-tracking branch 'origin/master'

 src/views/common/rawMaterial-part.vue

@@ -189,6 +189,7 @@
    // props:['currentRow'],
    methods: {
      getData() {
        console.log(1111);
        if (this.$refs.rawPartTable !== undefined) {
          this.$refs.rawPartTable.getDataList()
        }

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

@@ -345,7 +345,9 @@
              userName: '',
              testState: ''
            }],
            dataRule: {},
            dataRule: {
              code:[{ required: true, message: '请扫描选择零件', trigger: 'blur' }]
            },
            deviceList: [],
        }
    },
@@ -373,7 +375,7 @@
    },
    methods:{
      getResultInfo(data){
        console.log("扫描出的二维码值",JSON.stringify(data));
        console.log("扫描后执行");
        let obj=JSON.parse(data)
        let info={"code":obj["part_no"]}
        this.paramObj = info