From bd8e04e5fce5dfc87fb1edf23b0e3e2fad8abe98 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 06 八月 2024 19:23:00 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/do/b1-ins-order/add.vue | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index d08b861..42690c4 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -475,7 +475,7 @@
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
:autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'ask')"
- v-if="active==1&&isAskOnlyRead"></el-input>
+ v-if="active==1&&isAskOnlyRead&&/[0-9]/.test(scope.row.ask)"></el-input>
<span v-else>
<!-- <template v-if="(scope.row.ask.indexOf('D')>-1
||scope.row.ask.indexOf('W')>-1
@@ -1573,10 +1573,29 @@
isHaveBushing = false
}
})
- // console.log('isHaveBushing===', this.totalArr)
+ //杩囨护妫�娴嬮」锛氬幓闄ょ壒娈婇」(bsm=1),
+ let filterProductList = this.productListSelected.filter(ele=>ele.bsm==0&&/[0-9]/.test(ele.ask)).filter(ele=>{
+ if(select[1].indexOf('閫氫俊')>=0 && ['鍏夌紗','鍏夌氦'].includes(select[2])){
+ return !['娓╁害寰幆','鍏夌氦鎺ュご鎹熻��'].includes(ele.inspectionItem)
+ }
+ return true
+ }).filter(ele=>{
+ if(select[1].indexOf('鐢靛姏')>=0){
+ return !['娓╁崌璇曢獙','鐑惊鐜�'].includes(ele.inspectionItem)
+ }
+ return true
+ })
+ //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪
+ const isTrue = this.checkRequiredValueAndRemark(filterProductList)
+ if(!isTrue){
+ this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
+ return
+ }
+
+ console.log('isHaveBushing===', this.totalArr)
// inspectionItem
let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
- // console.log('isHaveBushing===', isHaveBushing)
+ console.log('isHaveBushing===', isHaveBushing)
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
@@ -1616,6 +1635,46 @@
}
}
},
+ checkRequiredValueAndRemark(data){
+ let isTrue = true
+ try{
+ data.forEach(ele=>{
+ if(['鈮�','鈮�','>','<','='].includes(ele.ask[0])){
+ const askVal = ele.ask.substring(1,ele.ask.length)
+ if(isNaN(askVal) || ele.tell.indexOf(askVal)<0){
+ isTrue = false
+ }
+ }
+ if(ele.ask.indexOf('-')>0 && ele.ask.length>1){
+ const splits = ele.ask.split('-')
+ if(splits.length==2 && !isNaN(splits[0]) && !isNaN(splits[1])){
+ let min = Math.min(...splits)
+ let max = Math.max(...splits)
+ if(ele.tell.indexOf('卤')<0&&ele.tell!=ele.ask){
+ isTrue = false
+ }else if(ele.tell.indexOf('卤')>0&&ele.tell!=ele.ask){
+ let splitNums = ele.tell.split('卤')
+ if(splitNums.length<2){
+ isTrue = false
+ }else{
+ let minTell = Number(splitNums[0])-Number(splitNums[1])
+ let maxTell = Number(splitNums[0])+Number(splitNums[1])
+ if(minTell!=min || maxTell!=max){
+ isTrue = false
+ }
+ }
+ }
+ }else{
+ isTrue = false
+ }
+ }
+ })
+ }catch(error){
+ console.log(error);
+ isTrue = false
+ }
+ return isTrue
+ },
save0(){
if(this.editTable.every(m=>m.value)){
let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
--
Gitblit v1.9.3