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

王震

2024-01-22 71754fe875a9a550e19c5192163f4256461aaeab

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

 src/views/quality/rawMaterial/index.vue

@@ -389,8 +389,9 @@
            }
        },
        formatJudgeState(row, column, cellValue){
            if(cellValue != undefined || cellValue != null){
            if(cellValue != undefined && cellValue != null && cellValue != ''){
                if(cellValue == 0){
                    console.log(cellValue);
                    return "<span style='color:#E84738;'>不合格</span>"
                }
                return "<span style='color:#34BD66;'>合格</span>"

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

@@ -3,7 +3,7 @@
    <div class="page-header">
      <div class="header-left">
        <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
        <h2 v-if="(resultVal!=null || resultVal!='') && dataForm.id!=null">查看-原材料检验</h2>
        <h2 v-if="(resultVal!=null && resultVal!='') && dataForm.id!=null">查看-原材料检验</h2>
        <h2 v-else>编辑-原材料检验</h2>
      </div>
      <div class="btn-group header-right">
@@ -32,12 +32,12 @@
                  <el-button
                    slot="append"
                    icon="el-icon-search"
                    :disabled="(resultVal!=null || resultVal!='')"
                    :disabled="(resultVal!=null && resultVal!='')"
                    @click="queryCode"></el-button>
                    <el-button
                    slot="append"
                    icon="el-icon-full-screen"
                    :disabled="(resultVal!=null || resultVal!='')"
                    :disabled="(resultVal!=null && resultVal!='')"
                    @click="Turnonthecamera"></el-button>
                </el-input>
                </el-form-item>
@@ -86,7 +86,7 @@
                </el-col>
                <el-col :span="6">
                  <el-form-item label="数量" prop="number">
                      <el-input v-model="dataForm.number" :disabled="(resultVal!=null || resultVal!='')" />
                      <el-input v-model="dataForm.number" :disabled="(resultVal!=null && resultVal!='')" />
                  </el-form-item>
                </el-col>
            </el-row>
@@ -174,7 +174,7 @@
                          <div v-if="!scope.row.children">
                          <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！" placement="top-start">
                            <el-autocomplete clearable
                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null || resultVal!=''))"
                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                            @input="changeState(scope.row,scope.$index)"
                            v-model="scope.row.testValueList[index]"
                            :fetch-suggestions="querySearch"
@@ -186,7 +186,7 @@
                            </el-autocomplete>

                              <!-- <el-select style="width:100%" filterable
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null || resultVal!=''))"
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                              v-model="scope.row.testValueList[index]"
                              placeholder="请输入或选择检测值"
                              allow-create
@@ -204,7 +204,7 @@
                      <el-table-column prop="deviceName" label="试验设备" min-width="200">
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-select ref="" :disabled="dataForm!=null && (resultVal!=null || resultVal!='')" style="width:60%"
                            <el-select ref="" :disabled="dataForm!=null && (resultVal!=null && resultVal!='')" style="width:60%"
                            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>
@@ -213,7 +213,7 @@
                            size="small"
                            slot="append"
                            icon="el-icon-full-screen"
                            :disabled="dataForm!=null && (resultVal!=null || resultVal!='')"
                            :disabled="dataForm!=null && (resultVal!=null && resultVal!='')"
                            @click="codeDevice(scope.row,scope.$index)"></el-button>
                          </div>
                        </template>
@@ -221,7 +221,7 @@
                      <el-table-column prop="note" label="检验描述" width="160" >
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null || resultVal!=''))" v-model="scope.row.note" placeholder="检验描述"></el-input>
                            <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" v-model="scope.row.note" placeholder="检验描述"></el-input>
                          </div>
                        </template>
                      </el-table-column>
@@ -256,7 +256,7 @@
              element-loading-text="请稍等，文件上传中"
            >
              <el-upload
                :disabled="dataForm.rawInsNo==null || (resultVal!=null || resultVal!='')"
                :disabled="dataForm.rawInsNo==null || (resultVal!=null && resultVal!='')"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
@@ -311,7 +311,7 @@
                    @click="delProcessConfigFile(scope.row)"
                    type="text"
                    size="small"
                    :disabled="(resultVal!=null || resultVal!='')"
                    :disabled="(resultVal!=null && resultVal!='')"
                    >删除</el-button
                  >
                  <el-button
@@ -346,7 +346,7 @@
                </el-table-column>
                <el-table-column  label="操作">
                    <template>
                        <el-button type="text" :disabled="(resultVal!=null || resultVal!='') && dataForm.id!=null" @click="showDialog()" size="small">上报</el-button>
                        <el-button type="text" :disabled="(resultVal!=null && resultVal!='') && dataForm.id!=null" @click="showDialog()" size="small">上报</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -493,6 +493,7 @@
    created(){
      this.dataForm.id = this.$route.query.id
      this.resultVal = this.$route.query.resultVal
      console.log("aa--",this.resultVal);
      if(this.resultVal == null){
        let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
        val == undefined ? null : this.resultVal=val