Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-18 26c4f7ae79ad5ad2300876b94f96f19e4f93d53a

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

@@ -137,11 +137,17 @@
                                    <span v-if="resultVal != null && scope.row.iname != null"
                                        v-text="scope.row.ename"></span>
                                    <div v-else>
                                        <el-select style="width:100%" v-model="scope.row.eId" v-if="scope.row.iname != null"
                                        <el-select style="width:80%" v-model="scope.row.eId" v-if="scope.row.iname != null"
                                            filterable @change="updateDevice(scope.row, scope.$index)">
                                            <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
                                                :label="item.code + '-' + item.name"></el-option>
                                        </el-select>
                                        <el-button
                                    size="small"
                                    slot="append"
                                    icon="el-icon-full-screen"
                                    v-if="scope.row.iname != null"
                                    @click="codeDevice(scope.row,scope.$index)"></el-button>
                                    </div>
                                </template>
                            </el-table-column>
@@ -202,6 +208,18 @@
                </el-row>
            </div>
        </div>
        <el-dialog
  title="设备扫描"
  :visible.sync="deviceCode"
  width="60%">
  <div style="height: 100vh;width: 100%;">
    <qr-code-app ref="codeDeviceCompont" @ok="getDeviceResultInfo" @cancelCodeDialog="cancelDeviceCodeDialog"></qr-code-app>
  </div>
  <span slot="footer" class="dialog-footer">
    <el-button @click="deviceCode = false">取 消</el-button>
    <el-button type="primary" @click="deviceCode = false">确 定</el-button>
  </span>
</el-dialog>
    </div>
</template>
    
@@ -215,9 +233,16 @@
    updateProcessInspectsById,
} from '@/api/quality/processInspect'
import { selectDevice } from '@/api/quality/processInspect'
import qrCodeApp from '@/views/common/qrCodeApp'
export default {
    components:{
        qrCodeApp
    },
    data() {
        return {
            row: null,
            proIndex: 0,
            deviceCode: false,
            rules: {
                orderNumber: [{required:true,message:'订单号不能为空',trigger:'blur'}]
            },
@@ -273,6 +298,33 @@
        this.init()
    },
    methods: {
        cancelDeviceCodeDialog(){
        this.deviceCode = false
      },
      getDeviceResultInfo(val){
        console.log("扫描后数据",val);
        let id=val.split("id@")[1]
        if(id!=undefined&&id!=''&&id!=null){
            let filterData=this.deviceList.filter(item=>{
          return item.id==id
        })[0]
        console.log(filterData);
        this.row.eId=Number(id)
        this.updateDevice(this.row)
        }else{
            this.$message({
          message: '未识别出二位码计量器具信息！',
          type: 'warning'
        });
        }
      },
      codeDevice(row,index){
        this.row=row 
        console.log("row",row);
        this.deviceCode =true
        this.$refs.codeDeviceCompont.openCamera()
        this.proIndex=index
      },
        submitSave() {
            let pro = 0
            this.inspectionItems.forEach(item => {