From 36c83e777e50977590a07b641e5bf2cf8dedf1e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 一月 2024 10:04:27 +0800
Subject: [PATCH] 原材料
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 25 +++++++++++++------------
src/views/quality/rawMaterial/index.vue | 3 ++-
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 063bb40..4be4f40 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/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>"
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 6c08e7a..14790b0 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/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
--
Gitblit v1.9.3