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

王震

2023-12-22 2b885af197394576f92f0a70d3aba535aa7ca00c

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

@@ -106,20 +106,17 @@
            </el-row>
        </el-form>
      </div>



      <div class="rawMaterial-detail">
        <el-row style="width:100%;z-index: 10;height:50px;">
            <el-col :span="18">检验项目</el-col>
            <el-col :span="2">
              <el-button style="width:90%" v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button>
            <el-col :xs="12" :lg="15">检验项目</el-col>
            <el-col :xs="4" :lg="3" style="text-align: right;">
              <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button>
            </el-col>
            <el-col :span="2">
              <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">添加检测值列</el-button>
            <el-col :xs="4" :lg="3" style="text-align: right;">
              <el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">添加检测值列</el-button>
            </el-col>
            <el-col :span="2">
              <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">删除检测值列</el-button>
            <el-col :xs="4" :lg="3" style="text-align: right;">
              <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">删除检测值列</el-button>
            </el-col>
        </el-row>
        <el-row style="width:100%;">
@@ -185,11 +182,17 @@
                  <el-table-column prop="deviceName" label="试验设备" min-width="260">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-select :disabled="dataForm!=null && resultVal!=null" style="width:100%"
                        <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:80%"
                        v-model="scope.row.deviceId" 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"
                        :disabled="dataForm!=null && resultVal!=null"
                        @click="codeDevice(scope.row,scope.$index)"></el-button>
                      </div>
                    </template>
                  </el-table-column>
@@ -278,6 +281,18 @@
    <el-button type="primary" @click="qrcode = false">确 定</el-button>
  </span>
</el-dialog>
<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>

@@ -299,6 +314,9 @@
    computed:{},
    data(){
        return{
            row: null,
            proIndex: 0,
            deviceCode: false,
            qrcode: false,
            userdata:[],
            currentRow:[],
@@ -374,11 +392,53 @@
      },
    },
    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.deviceId=Number(id)
        this.updateDevice(this.row,this.proIndex)
        }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
      },
      getResultInfo(data){
        console.log("扫描后执行",data);
        if(!data.includes("part_no")){
          this.$message({
          message: '未识别出二位码零件信息！',
          type: 'warning'
        });
        }
        let obj=JSON.parse(data)
        let info={"code":obj["part_no"]}
        this.paramObj = info
        this.showPart = true
        console.log("值",info);
        if(info.code!=undefined&&info.code!=''){
          this.paramObj = info
          this.showPart = true
        }else{
          this.$message({
          message: '未识别出二位码零件信息！',
          type: 'warning'
        });
        }
      },
      cancelCodeDialog(){
        this.qrcode = false
@@ -516,7 +576,7 @@
              required: null,
              rpId: null,
              name: null,
              unit: null,
              unit: 'mm',
              userName: null,
              testValue: '',
              testValueList: [],
@@ -652,7 +712,7 @@
            let isTrue = true
            for(var i=0;i<row.testValueList.length;i++){
              let val = row.testValueList[i]
              let reg = /^[0-9]*[1-9][0-9]*$/
              let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
              if(!reg.test(val) && !['是','否'].includes(val)){
                this.$message.error("请输入数字或选择是否")
                row.testValueList[i] = null
@@ -710,7 +770,7 @@
          required: null,
          rpId: null,
          name: null,
          unit: null,
          unit: 'mm',
          userName: null,
          testValue: null,
          testValueList: [],
@@ -943,4 +1003,9 @@
  border: 1px solid #e4e7ed;
  border-bottom: none;
}
@media (max-width: 767px) {
  .pad-addcol-btn{
    font-size:12px;
  }
}
</style>