From 14b15cb429be4c2cf9d7372afcd3bf1e6c53d6af Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期一, 12 八月 2024 13:29:41 +0800
Subject: [PATCH] modified: src/components/do/b1-ins-order/fiberoptic-config.vue
---
src/components/do/b1-ins-order/add.vue | 125 ++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 75 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index dee5543..5f0baee 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -759,7 +759,7 @@
width="800px" :show-close="false">
<el-table
:data="editTable"
- style="width: 100%">
+ style="width: 100%" height="80vh">
<!-- inspectionItemList -->
<el-table-column
prop="inspectionItemList"
@@ -906,6 +906,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 +916,15 @@
components: {
ValueTable,
fiberOpticConfig,
+ fiberOpticConfigTwo,
equipConfig,
cableConfig
},
props: {
+ examine: {
+ type: Number,
+ default: () => 0
+ },
active: {
type: Number,
default: () => 0
@@ -1178,12 +1184,11 @@
inputValueHandler(row,index){
if(row){
const nextIndex = index+1
+ console.log(nextIndex, this.editTable)
for (let i = nextIndex; i < this.editTable.length; i++) {
const element = this.editTable[i];
- if(element.model==row.model){
+ if(element.model==row.model&&row.symbolItem==element.symbolItem){
this.editTable[i].value = row.value
- }else{
- break;
}
}
}
@@ -1585,25 +1590,17 @@
}
return true
})
- /* //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪
- const isTrue = this.checkRequiredValueAndRemark(filterProductList)
- if(!isTrue){
- this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
- return
- } */
- //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪,浠呭鎵樿姹�
- if(this.isAskOnlyRead){
+ //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪,浠呭鎵樿姹�
+ if(this.active==1&&this.isAskOnlyRead){
const isTrue = this.checkRequiredValueAndRemark(filterProductList)
- if(!isTrue){
- this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
- return
- }
+ 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)
@@ -1643,56 +1640,12 @@
}
}
},
- /* 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){
- 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&&tell.indexOf(ele.ask)<0){
- 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
- }, */
/**
-聽 聽 聽 聽* 鏍￠獙濮旀墭瑕佹眰鐨勬楠岄」鐨勮姹傛弿杩板拰瑕佹眰鍊�
-聽 聽 聽 聽*
-聽 聽 聽 聽*/
+ * 鏍￠獙濮旀墭瑕佹眰鐨勬楠岄」鐨勮姹傛弿杩板拰瑕佹眰鍊�
+ *
+ */
checkRequiredValueAndRemark(data){
- let isTrue = true
+ let isTrue = true
try{
data.forEach(ele=>{
//鍒ゆ柇锛堚墹,鈮�,>,<,=锛夎繖鍑犵鎯呭喌
@@ -1705,7 +1658,7 @@
}
//鍒ゆ柇鑼冨洿(10-25),瑕佹眰鍊煎繀椤绘槸-
if(ele.ask.indexOf('-')>0 && ele.ask.length>1){
- //瑕佹眰鎻忚堪鐨剘鍜岃姹傚�肩殑-锛岀瓑鏁�
+ //瑕佹眰鎻忚堪鐨剘鍜岃姹傚�肩殑-锛岀瓑鏁�
let tell = ele.tell
if(ele.tell.indexOf('~')>0){
tell = ele.tell.replace('~','-')
@@ -1713,12 +1666,31 @@
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&&tell.indexOf(ele.ask)<0){
+ /**
+ * 鍒ゆ柇鎯呭喌
+ * 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
@@ -1741,7 +1713,6 @@
}
return isTrue
},
-
save0(){
if(this.editTable.every(m=>m.value)){
let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
@@ -2468,6 +2439,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
@@ -3023,7 +2999,6 @@
getTotal() {
this.totalArr = []
this.total = 0;
- // console.log(this.sampleList)
this.sampleList.forEach(item => {
if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
--
Gitblit v1.9.3