From 36653c98622c8a74cb850575b2001457121b794c Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期四, 25 一月 2024 16:16:22 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/quality/rawMaterial/rawMaterial-form.vue | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue index 6c08e7a..2e2a60c 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 @@ -340,13 +340,13 @@ <el-table-column prop="userName" label="妫�楠屽憳"></el-table-column> <el-table-column prop="judgeState" label="妫�楠岀粨璁�"> <template slot-scope="scope"> - <el-tag type="success" v-if="scope.row.testState == '1'">鍚堟牸</el-tag> - <el-tag type="danger" v-else-if="scope.row.testState == '0'">涓嶅悎鏍�</el-tag> + <el-tag type="success" v-if="scope.row.testState == 1">鍚堟牸</el-tag> + <el-tag type="danger" v-else-if="scope.row.testState == 0">涓嶅悎鏍�</el-tag> </template> </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> @@ -492,7 +492,7 @@ }, created(){ this.dataForm.id = this.$route.query.id - this.resultVal = this.$route.query.resultVal + this.resultVal = this.$route.params.resultVal if(this.resultVal == null){ let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id) val == undefined ? null : this.resultVal=val @@ -892,10 +892,12 @@ for(var i=0;i<row.testValueList.length;i++){ let val = row.testValueList[i] let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/ - if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){ - row.testValueList[i] = null - this.$message.error("璇疯緭鍏�6浣嶆暟瀛楁垨閫夋嫨鏄惁") - isTrue = false + if(val.slice(-1)!='.'){ + if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){ + row.testValueList[i] = null + this.$message.error("璇疯緭鍏�6浣嶆暟瀛楁垨閫夋嫨鏄惁") + isTrue = false + } } } if(!isTrue){ -- Gitblit v1.9.3