From 9b0a82931d2d4ef6fa877ebba59737a65ba37103 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期三, 07 八月 2024 11:18:53 +0800 Subject: [PATCH] 检验下单-检验项要求值校验修改 --- src/components/do/b1-ins-order/add.vue | 8 ++++++-- src/components/do/b1-inspect-order-plan/Inspection.vue | 10 ++++++---- src/components/view/b1-inspect-order-plan.vue | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue index 881bda3..033ba53 100644 --- a/src/components/do/b1-ins-order/add.vue +++ b/src/components/do/b1-ins-order/add.vue @@ -1573,7 +1573,7 @@ isHaveBushing = false } }) - //杩囨护妫�娴嬮」锛氬幓闄ょ壒娈婇」(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) @@ -1646,11 +1646,15 @@ } } if(ele.ask.indexOf('-')>0 && ele.ask.length>1){ + let tell = ele.tell + if(ele.tell.indexOf('~')>0){ + tell = ele.tell.replace('~','-') + } 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){ + if(ele.tell.indexOf('卤')<0&&tell.indexOf(ele.ask)<0){ isTrue = false }else if(ele.tell.indexOf('卤')>0&&ele.tell!=ele.ask){ let splitNums = ele.tell.split('卤') diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue index efdf353..2f55a89 100644 --- a/src/components/do/b1-inspect-order-plan/Inspection.vue +++ b/src/components/do/b1-inspect-order-plan/Inspection.vue @@ -254,18 +254,20 @@ </el-col> </el-row> <div class="search"> - <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px"> + <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px" label-position="right"> <el-form-item label="濮旀墭缂栧彿:"> <el-input clearable v-model="insOrder.entrustCode" disabled size="small" placeholder="璇疯緭鍏�"></el-input> </el-form-item> <el-form-item label="鏍峰搧缂栧彿:"> - <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�" style="width: 100px;"></el-input> + <el-tooltip :disabled="!currentSample.sampleCode" :content="currentSample.sampleCode"> + <el-input clearable v-model="currentSample.sampleCode" disabled size="small" placeholder="璇疯緭鍏�" ></el-input> + </el-tooltip> </el-form-item> <el-form-item label="鏍峰搧鍚嶇О:"> <el-input clearable v-model="currentSample.sample" disabled size="small" placeholder="璇疯緭鍏�"></el-input> </el-form-item> <el-form-item label="鏍峰搧鏁伴噺:"> - <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�" style="width: 70px;"></el-input> + <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�" ></el-input> </el-form-item> <el-form-item label="涓嬪彂鏃堕棿:"> <el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="璇疯緭鍏�"></el-input> @@ -274,7 +276,7 @@ <el-input clearable v-model="insOrder.typeName" disabled size="small" placeholder="璇疯緭鍏�"></el-input> </el-form-item> <el-form-item label="绾﹀畾鏃堕棿:"> - <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�" style="width: 100px;"></el-input> + <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input> </el-form-item> <el-form-item label="褰撳墠鏍峰搧浣嶆暟:"> <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag> diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue index ea64308..05c0f51 100644 --- a/src/components/view/b1-inspect-order-plan.vue +++ b/src/components/view/b1-inspect-order-plan.vue @@ -309,7 +309,7 @@ if(user){ currentUserName = user.name } - return row.userName!=currentUserName || row.checkName!=currentUserName + return row.userName!=currentUserName && row.checkName!=currentUserName } },{ id: '', -- Gitblit v1.9.3