From 1994756ca5b2e646202daa2c04a72bf2d421f3d8 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期五, 09 八月 2024 17:57:05 +0800
Subject: [PATCH] modified: src/components/do/b1-ins-order/fiberoptic-config-two.vue modified: src/components/do/b1-ins-order/fiberoptic-config.vue modified: src/components/view/b1-inspect-order-plan.vue modified: src/components/view/b1-inspection-order.vue
---
src/components/do/b1-ins-order/add.vue | 78 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 17 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 42690c4..ceb28b6 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&&/[0-9]/.test(scope.row.ask)"></el-input>
+ v-if="active==1&&isAskOnlyRead&&scope.row.inspectionValueType!='5'"></el-input>
<span v-else>
<!-- <template v-if="(scope.row.ask.indexOf('D')>-1
||scope.row.ask.indexOf('W')>-1
@@ -620,7 +620,8 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
+ <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 0" :active="active" />
+ <fiberOpticConfigTwo :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 1" :active="active" />
<equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
<cableConfig v-if="cableConfigShow" :active="active" />
<!-- 鍗曢�夌壒娈婂�煎鐞嗘-->
@@ -906,6 +907,7 @@
<script>
import ValueTable from '../../tool/value-table.vue'
import fiberOpticConfig from './fiberoptic-config.vue'
+import fiberOpticConfigTwo from './fiberoptic-config-two.vue'
import equipConfig from './equip-config.vue'
import cableConfig from './cable-config.vue'
import Vue from 'vue'
@@ -915,10 +917,15 @@
components: {
ValueTable,
fiberOpticConfig,
+ fiberOpticConfigTwo,
equipConfig,
cableConfig
},
props: {
+ examine: {
+ type: Number,
+ default: () => 0
+ },
active: {
type: Number,
default: () => 0
@@ -1573,7 +1580,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)
@@ -1585,17 +1592,17 @@
}
return true
})
- //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪
- const isTrue = this.checkRequiredValueAndRemark(filterProductList)
- if(!isTrue){
- this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
- return
+ //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪,浠呭鎵樿姹�
+ if(this.active==1&&this.isAskOnlyRead){
+ const isTrue = this.checkRequiredValueAndRemark(filterProductList)
+ if(!isTrue){
+ this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
+ return
+ }
}
- console.log('isHaveBushing===', this.totalArr)
- // inspectionItem
+ // console.log('isHaveBushing===', this.totalArr)
let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
- console.log('isHaveBushing===', isHaveBushing)
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
@@ -1635,24 +1642,57 @@
}
}
},
+ /**
+ * 鏍￠獙濮旀墭瑕佹眰鐨勬楠岄」鐨勮姹傛弿杩板拰瑕佹眰鍊�
+ *
+ */
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
}
}
+ //鍒ゆ柇鑼冨洿(10-25),瑕佹眰鍊煎繀椤绘槸-
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){
+ /**
+ * 鍒ゆ柇鎯呭喌
+ * 1.瑕佹眰鎻忚堪涓庤姹傛弿杩扮浉鍚�
+ * 2.瑕佹眰鎻忚堪鍖呭惈瑕佹眰鍊�
+ * 3.瑕佹眰鎻忚堪涓�3N-10N杩欑鎯呭喌
+ * 4.瑕佹眰鎻忚堪涓�10卤5杩欑鎯呭喌
+ * 5.
+ */
+ let min = Math.min(...splits)
+ let max = Math.max(...splits)
+ if(min==max){
isTrue = false
- }else if(ele.tell.indexOf('卤')>0&&ele.tell!=ele.ask){
+ }
+ //瑕佹眰鎻忚堪涓笉鍖呭惈卤浠ュ強鍖洪棿鐨勬暟瀛楋紝鍒欒繑鍥瀎alse
+ if((tell.indexOf('卤')<0&&tell.indexOf('-')<0)){
+ isTrue = false
+ }else if(ele.tell.indexOf('-')==0){
+ isTrue = false
+ }else if(tell.indexOf('-')>0){
+ const splitTells = tell.split('-')
+ if(splitTells[0].indexOf(min)<0 || splitTells[1].indexOf(max)<0){
+ isTrue = false
+ }
+ }else if(tell.indexOf('卤')>0&&tell!=ele.ask){
+ //鏍￠獙瑕佹眰鎻忚堪涓�10卤5杩欑鍐欐硶鐨勬儏鍐�
let splitNums = ele.tell.split('卤')
if(splitNums.length<2){
isTrue = false
@@ -2401,6 +2441,11 @@
this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById + '?id=' + e).then(res => {
if (res.code == 201) return
let obj = JSON.parse(res.data)
+ console.log(obj);
+ //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
+ let user = JSON.parse(localStorage.getItem('user'))
+ obj.addObj.custom = user.name
+ obj.addObj.userId = user.userId
this.addObj = obj.addObj;
this.sampleList = obj.sampleList;
this.selectTree = obj.selectTree
@@ -2956,9 +3001,8 @@
getTotal() {
this.totalArr = []
this.total = 0;
- // console.log(this.sampleList)
this.sampleList.forEach(item => {
- if (item.insProduct && item.insProduct.length > 0) {
+ if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
this.totalArr.push(a)
})
--
Gitblit v1.9.3