From a6c14c75e5a5f677c2a3571cad426d50cb106e3d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 09 八月 2024 09:02:59 +0800
Subject: [PATCH] 修改检验任务、下单bug
---
/dev/null | 1
static/js/worker.js | 16
src/components/do/b1-ins-order/add.vue | 5
src/components/tool/value-table.vue | 25
src/components/do/b1-inspect-order-plan/Inspection.vue | 115 ++++--
src/components/view/b1-inspect-order-plan.vue | 2
src/components/do/b1-ins-order/fiberoptic-config.vue | 812 ++++++++++++++++++++++++++++++++++++++++-------
src/components/view/b1-inspection-order.vue | 16
8 files changed, 790 insertions(+), 202 deletions(-)
diff --git a/.nvmdrc b/.nvmdrc
deleted file mode 100644
index 421dc09..0000000
--- a/.nvmdrc
+++ /dev/null
@@ -1 +0,0 @@
-18.11.0
\ No newline at end of file
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 03aead4..b06da57 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1592,7 +1592,7 @@
return
}
- console.log('isHaveBushing===', this.totalArr)
+ // console.log('isHaveBushing===', this.totalArr)
let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
@@ -2958,9 +2958,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)
})
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index f522a9c..ad78730 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -22,7 +22,7 @@
<label style="width: 70px;">鏍峰搧鍨嬪彿</label>
<span style="font-size: 14px;">{{models}}</span>
</div>
- <el-radio-group v-model="packageInfo.radio" size="small" @change="upNum()" :disabled="active!=1">
+ <el-radio-group v-model="packageInfo.radio" size="small" @change="isInspection()" :disabled="active!=1">
<el-radio :label="0">鍏ㄦ</el-radio>
<el-radio :label="1">鎶芥</el-radio>
</el-radio-group>
@@ -31,15 +31,15 @@
style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;">
<div class="search-item" style="margin-right: 10px;">
<label>濂楃鏁扮洰</label>
- <el-input v-model="packageInfo.num1" placeholder="璇疯緭鍏�" size="small" @change="upNum" :disabled="active!=1"></el-input>
+ <el-input v-model="packageInfo.num1" placeholder="璇疯緭鍏�" size="small" @blur="addBushing" :disabled="active!=1"></el-input>
</div>
<div class="search-item" style="margin-right: 10px;">
<label style="width: 70px;">鏍囧噯閲�</label>
- <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @change="upNum" :disabled="active!=1"></el-input>
+ <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="active!=1"></el-input>
</div>
<div class="search-item">
<label style="width: 70px;">妫�娴嬮噺</label>
- <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @change="upNum"
+ <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @blur="addTestNum"
:disabled="packageInfo.radio===0||active!=1"></el-input>
</div>
</div>
@@ -107,21 +107,22 @@
<el-col :span="12" v-if="packageInfo.ismiers">
<div class="grid-content">
<h5>鍏夌氦甯�
- <!-- <el-button size="mini" type="primary" class="btns" @click="addFibers"
- :disabled="miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button> -->
- <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button>
+ <el-button size="mini" type="primary" class="btns" @click="addFibers"
+ v-if="active==1">鐢熸垚鍏夌氦甯�</el-button>
+ <!-- <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button> -->
</h5>
<div
style="display: flex;align-items: center;justify-content: space-between;margin:4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
- <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <!-- <div class="search-item" style="width: 50%;margin-right: 16px;">
<label style="width: 80px;">绾ゅ甫绫诲瀷</label>
<el-select v-model="miresModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
- :disabled="selectBushing.length===0||active!=1">
+ :disabled="selectBushing.length===0||active!=1"
+ >
<el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value">
</el-option>
</el-select>
- </div>
- <div class="search-item" style="width: 50%;">
+ </div> -->
+ <!-- <div class="search-item" style="width: 50%;">
<label style="width: 80px;">鍙傝�冩爣鍑�</label>
<el-select v-model="miresStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
:disabled="miresModel===null||active!=1" @focus="selectsStandardMethodByFLSSM2()"
@@ -129,10 +130,30 @@
<el-option v-for="item in miresStandards" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
+ </div> -->
+ <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <label style="width: 80px;">绾ゅ甫绫诲瀷</label>
+ <el-select v-model="miresModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ :disabled="selectBushing.length===0||active!=1"
+ >
+ <el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
</div>
+ <div class="search-item" style="width: 50%;">
+ <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+ <el-select v-model="miresStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ :disabled="miresModel===null||active!=1"
+ @focus="selectsStandardMethodByFLSSM2()"
+ @change="(value)=>methodChange2(value)">
+ <el-option v-for="item in miresStandards" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
+ </div>
+
</div>
<el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
- size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,0)"
+ size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)"
:header-cell-class-name="setClassName0">
<el-table-column
type="selection"
@@ -140,12 +161,24 @@
:selectable="()=>(active==1)">
</el-table-column>
<el-table-column prop="code" label="鍏夌氦甯︾紪鍙�" show-overflow-tooltip align="center">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.code" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+ </template>
</el-table-column>
<el-table-column prop="model" label="鍏夌氦甯﹁鏍�" show-overflow-tooltip align="center">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.model" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+ </template>
</el-table-column>
<el-table-column prop="standard" label="鍙傝�冩爣鍑�" show-overflow-tooltip align="center">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.standard" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+ </template>
</el-table-column>
<el-table-column prop="num" label="鍏夌氦妫�娴嬮噺" show-overflow-tooltip align="center">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.num" placeholder="璇疯緭鍏�" size="mini" ></el-input>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -153,12 +186,12 @@
<el-col :span="!packageInfo.ismiers?24:12">
<div class="grid-content">
<h5>鍏夌氦
- <!-- <el-button size="mini" type="primary" class="btns" @click="addFiber"
- :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button> -->
+ <el-button size="mini" type="primary" class="btns" @click="addFiber"
+ v-if="active==1">鍏夌氦閰嶈壊</el-button>
</h5>
<div
style="display: flex;align-items: center;justify-content: space-between;margin: 4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
- <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <!-- <div class="search-item" style="width: 50%;margin-right: 16px;">
<label style="width: 80px;">鍏夌氦绫诲瀷</label>
<el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
:disabled="selectBushing.length===0||active!=1">
@@ -174,11 +207,29 @@
<el-option v-for="item in mireStandards" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
+ </div> -->
+ <div class="search-item" style="width: 50%;margin-right: 16px;">
+ <label style="width: 80px;">鍏夌氦绫诲瀷</label>
+ <el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ >
+ <el-option v-for="(item,a) in mireModels" :key="a" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="search-item" style="width: 50%;">
+ <label style="width: 80px;">鍙傝�冩爣鍑�</label>
+ <el-select v-model="mireStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ :disabled="mireModel===null||active!=1"
+ @focus="selectsStandardMethodByFLSSM()"
+ @change="(value)=>methodChange(value)" :loading="mireStandardLoading">
+ <el-option v-for="item in mireStandards" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
</div>
</div>
<el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
size="small" highlight-current-row @selection-change="handleSelectionChange4"
- @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)"
+ @row-click="(row, column, event)=>rowClickFiber(row, column, event,0)"
:header-cell-class-name="setClassName0">
<el-table-column
type="selection"
@@ -295,6 +346,7 @@
</template>
<script>
+import { set } from 'vue'
export default {
props: {
active: {
@@ -304,6 +356,8 @@
},
data() {
return {
+ detectionType: null,
+ detectionSelect: [],
type:1,
saveLoad: false,
packageInfo: {
@@ -337,7 +391,7 @@
fiberList: [],
fibersList: [],
selectFibers: [],
- detectionItems:[],
+ detectionItems: [],
currentDetectionItems:null,
mireStandardLoading:false,
multiFiberList:[],
@@ -363,23 +417,23 @@
},
},
watch: {
- mireModel(val1,val0) {
- if(val1!=val0){
- this.mireStandards = []
- this.fiberList = []
- this.multiFiberList = []
- this.detectionItems = []
- this.currentDetectionItems = null;
- }
- },
- mireStandard(val1,val0) {
- if(val1!=val0){
- this.fiberList = []
- this.multiFiberList = []
- this.detectionItems = []
- this.currentDetectionItems = null;
- }
- }
+ // mireModel(val1,val0) {
+ // if(val1!=val0){
+ // this.mireStandards = []
+ // this.fiberList = []
+ // this.multiFiberList = []
+ // this.detectionItems = []
+ // this.currentDetectionItems = null;
+ // }
+ // },
+ // mireStandard(val1,val0) {
+ // if(val1!=val0){
+ // this.fiberList = []
+ // this.multiFiberList = []
+ // this.detectionItems = []
+ // this.currentDetectionItems = null;
+ // }
+ // }
},
mounted() {
this.$parent.sampleIds.forEach(a => {
@@ -391,6 +445,7 @@
}
}
})
+ console.log(111, this.sample);
this.models = this.models.replace(',', '')
this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')>-1))
if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
@@ -401,15 +456,27 @@
this.packageInfo.standNum = this.sample[0].bushing[0].standNum
this.packageInfo.testNum = this.sample[0].bushing[0].testNum
this.bushing.forEach(a=>{
- if(a.fibers===null)a.fibers=[]
- if(a.fiber===null)a.fiber=[]
+ if(a.fibers==null || a.fibers.length ==0)a.fibers=[]
+ if(a.fiber==null || a.fiber.length == 0)a.fiber=[]
+ // 鍒ゆ柇鏄惁鍚湁鍏夌氦甯�
if(this.packageInfo.ismiers){
- a.fibers.forEach(b=>{
+ this.fibersList = [] // 鏂板
+ this.fiberList = [] // 鏂板
+ if(a.fibers.length>0){
+ a.fibers.forEach(b=>{
+ // 鍏夌氦甯�
this.fibersList.push(b)
+ // 鍏夌氦
b.fiber.forEach(c=>{
this.fiberList.push(c)
})
})
+ } else {
+ a.fiber.forEach(b=>{
+ this.fiberList.push(b)
+ })
+ }
+
}else{
a.fiber.forEach(b=>{
this.fiberList.push(b)
@@ -417,9 +484,11 @@
}
})
}
+
this.getTypeDicts1()
this.getStandTreeBySampleType()
this.getStandTreeBySampleType2()
+ this.selectsStandardMethodByFLSSM2()
},
methods: {
handleSelectionChange(val) {
@@ -429,7 +498,29 @@
handleSelectionChange1(val) {
this.selectBushing = val
},
- handleSelectionChange2(val){},
+ handleSelectionChange2(val){
+ this.detectionSelect = val
+ // 璧嬪�兼娴嬮」淇℃伅 鍏夌氦甯�
+ if(this.detectionItems.type == 1) {
+ for(let i= 0; i < this.fibersList.length; i++){
+ this.multiFiberList.forEach(item => {
+ if(this.fibersList[i].ident == item.ident){
+ this.fibersList.find(a => a.ident == item.ident).productList = this.detectionSelect
+ }
+ })
+ }
+ }
+ if(this.detectionItems.type == 0) {
+ // 璧嬪�兼娴嬮」淇℃伅 鍏夌氦
+ this.multiFiberList.forEach(item => {
+ this.fiberList.forEach(a => {
+ if(a.ident == item.ident){
+ this.fiberList.find(a => a.ident == item.ident).productList = this.detectionSelect
+ }
+ })
+ })
+ }
+ },
handleSelectionChange4(val){
this.multiFiberList = val
},
@@ -442,6 +533,96 @@
}).then(res => {
this.colors = res.data
})
+ },
+ // 濂楃鏁扮洰鐢熸垚琛ㄦ牸鏁版嵁
+ addBushing() {
+ this.bushing = []
+ for(let i = 0; i < this.packageInfo.num1; i++){
+ let bushing = {
+ ident: this.bushing.length + 1,
+ color: this.colors[i].label,
+ standNum: null,
+ testNum: null,
+ fibers: [],
+ fiber: []
+ }
+ this.bushing.push(bushing)
+ }
+ },
+ // 濂楃鏍囧噯閲忚祴鍊�
+ addStandNum() {
+ if(this.selectBushing.length > 0) {
+ this.bushing.forEach(item => {
+ this.selectBushing.forEach(a => {
+ if(item.ident == a.ident) {
+ item.standNum = this.packageInfo.standNum
+ }
+ })
+ })
+ }
+ },
+ // 濂楃妫�娴嬮噺璧嬪��
+ addTestNum() {
+ if(this.selectBushing.length > 0) {
+ this.bushing.forEach(item => {
+ this.selectBushing.forEach(a => {
+ if(item.ident == a.ident) {
+ item.testNum = this.packageInfo.testNum
+ }
+ })
+ })
+ }
+ },
+ isInspection() {
+ this.fiberList = []
+ this.fibersList = []
+ this.detectionItems = []
+
+ // 椤甸潰鏄惁鍚湁鍏夌氦甯�
+ if(this.packageInfo.ismiers) {
+ // 鍏ㄦ
+ if (this.packageInfo.radio == 0) {
+ // 鏍规嵁鏍囧噯閲忚祴鍊兼娴嬮噺
+ if(parseInt(this.packageInfo.standNum) > 0 ) {
+ // 缁欏厜绾ゅ甫璧嬪��
+ this.packageInfo.testNum = this.packageInfo.standNum
+ this.selectBushing = this.bushing
+ this.addFibers()
+ this.selectFibers = this.fibersList
+ // 榛樿鍕鹃��
+ setTimeout(() => {
+ this.selectBushing.forEach(item =>{
+ let rowToSelect = this.bushing.find(a => a.ident == item.ident)
+ this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ })
+
+ this.selectFibers.forEach(item =>{
+ let rowToSelect = this.fibersList.find(a => a.ident == item.ident)
+ this.$refs.table2.toggleRowSelection(rowToSelect, true)
+ })
+ }, 200)
+ }
+ }
+ }else {
+ if(this.packageInfo.radio == 0) {
+ if(parseInt(this.packageInfo.standNum) > 0 ) {
+ this.packageInfo.testNum = this.packageInfo.standNum
+ this.selectBushing = this.bushing
+ this.addFiber()
+
+ // 榛樿鍕鹃��
+ setTimeout(() => {
+ this.selectBushing.forEach(item =>{
+ let rowToSelect = this.bushing.find(a => a.ident == item.ident)
+ this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ })
+ }, 200)
+ }
+ }
+ }
+
+
+
},
upNum() {
this.fiberList = []
@@ -477,7 +658,34 @@
}
this.bushing.push(bushing)
}
- } else {
+ // 缁欏厜绾ゅ甫璧嬪��
+ if(this.selectBushing.length===0){
+ this.selectBushing = this.bushing
+ }
+ // this.miresModels 绾ゅ甫绫诲瀷
+ // this.miresStandards 鍙傝�冩爣鍑�
+ this.fibersList = []
+ this.packageInfo.ismiers = true
+ this.fiberList = []
+ this.selectBushing.forEach(a => {
+ a.fiber = []
+ a.fibers = []
+ for(let j = 0; j < parseInt(a.testNum); j++){
+ let fibers = {
+ id: this.fibersList.length + 1,
+ code: null,
+ color: a.color,
+ model: null,
+ standard: null,
+ num: a.testNum,
+ productList: this.HaveJson(this.productList2),
+ fiber: []
+ }
+ a.fibers.push(fibers)
+ this.fibersList.push(fibers)
+ }
+ })
+ } else {
this.bushing = []
}
},
@@ -528,7 +736,46 @@
})
},
methodChange(val) {
- if (val === null || val === '') return
+ // if (val === null || val === '') return
+ // this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ // model: this.mireModel.split(' - ')[1],
+ // standardMethodListId: val,
+ // factory: ''
+ // }, {
+ // headers: {
+ // 'Content-Type': 'application/json'
+ // }
+ // }).then(res => {
+ // res.data.forEach(a => {
+ // a.state = 0
+ // })
+ // this.productList = res.data
+ // setTimeout(() => {
+ // this.productList.forEach(a => {
+ // if (a.state == 1) this.toggleSelection(a)
+ // })
+ // this.addFiber()
+ // }, 200)
+ // })
+
+ // 灏嗕笅鎷夋鍊艰祴鍊肩粰鍏夌氦 鐩戝惉鍘婚櫎
+ if(this.multiFiberList.length == 0) {
+ this.$message.error('璇烽�夋嫨鏁版嵁')
+ return
+ }
+ this.multiFiberList.forEach(item => {
+ this.fiberList.forEach(a => {
+ if(a.ident == item.ident){
+ a.model = this.mireModel.split(' - ')[1] // 鍏夌氦瑙勬牸
+ a.noSplitModel = this.mireModel // 鍏夌氦瑙勬牸
+ if(this.mireStandards != null) {
+ a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code // 鍙傝�冩爣鍑�
+ }
+ }
+ })
+ })
+ if (val === null || val === '') return
+ if(this.mireStandards == null ) return
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
model: this.mireModel.split(' - ')[1],
standardMethodListId: val,
@@ -538,19 +785,45 @@
'Content-Type': 'application/json'
}
}).then(res => {
- res.data.forEach(a => {
+ this.detectionItems = []
+ if(res.data != null && res.data.length != 0){
+ res.data.forEach(a => {
a.state = 0
})
- this.productList = res.data
- setTimeout(() => {
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- this.addFiber()
- }, 200)
+ this.detectionItems = res.data
+ this.detectionType = 0
+ this.$set(this.detectionItems,'type',0)
+ }
+
})
},
methodChange2(val) {
+ // if (val === null || val === '') return
+ // this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ // model: '',
+ // standardMethodListId: val,
+ // factory: '涓ぉ绉戞妧妫�娴嬩腑蹇� - 閫氫俊浜у搧瀹為獙瀹� - 鍏夌氦甯� - ' + this.miresModel + ' - ',
+ // }, {
+ // headers: {
+ // 'Content-Type': 'application/json'
+ // }
+ // }).then(res => {
+ // res.data.forEach(a => {
+ // a.state = 0
+ // })
+ // this.productList2 = res.data
+ // setTimeout(() => {
+ // this.productList2.forEach(a => {
+ // if (a.state == 1) this.toggleSelection(a)
+ // })
+ // this.addFibers()
+ // }, 200)
+ // })
+
+ if(this.multiFiberList.length == 0) {
+ this.$message.error('璇烽�夋嫨闇�瑕佹洿鏀圭殑鏁版嵁')
+ return
+ }
if (val === null || val === '') return
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
model: '',
@@ -561,19 +834,37 @@
'Content-Type': 'application/json'
}
}).then(res => {
- res.data.forEach(a => {
- a.state = 0
- })
- this.productList2 = res.data
- setTimeout(() => {
- this.productList2.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
+ // 灏嗚幏鍙栫殑妫�娴嬮」淇℃伅璧嬪��
+ this.detectionItems = []
+ if(res.data != null && res.data.length != 0){
+ res.data.forEach(a => {
+ a.state = 0
})
- this.addFibers()
- }, 200)
- })
+ this.detectionItems = res.data
+ this.detectionType = 1
+ this.$set(this.detectionItems,'type',1)
+ }
+
+ // 缁欓�変腑鐨勫厜绾ゅ甫璧嬪��
+ for(let i= 0; i < this.fibersList.length; i++){
+ this.multiFiberList.forEach(item => {
+ if(this.fibersList[i].ident == item.ident){
+ this.fibersList[i].model = this.miresModel // 绾ゅ甫瑙勬牸
+ this.fibersList[i].num = this.miresModel.replace('鑺�','') // 鍏夌氦妫�娴嬮噺
+ this.fibersList[i].productList = this.detectionItems // 妫�娴嬮」
+ this.miresStandards.forEach(a => {
+ if(a.id == this.miresStandard) {
+ this.fibersList[i].standard = a.code // 鍙傝�冩爣鍑�
+ }
+ })
+ }
+ })
+ }
+ })
},
addFiber() {
+
+ // 鏈�鏂�
let colors2 = []
if (this.packageInfo.num1 / this.colors.length > 1) {
let num = this.packageInfo.num1 / this.colors.length
@@ -585,24 +876,22 @@
colors2 = colors2.concat(this.colors)
}
this.fiberList = []
- let model = this.mireModel.split(' - ')[1]
- let standard = this.mireStandards.find(a => a.id == this.mireStandard).code
+ // 閫夋嫨浜嗗厜绾ゅ甫
if (this.packageInfo.ismiers) {
- if(this.selectFibers.length === 0){
- this.$message.error('鏈�夋嫨鍏夌氦甯�')
- return
- }
+ if(this.selectFibers.length != 0){
this.selectFibers.forEach((a,index) => {
a.fiber = []
for (var i = 0; i < parseInt(a.num); i++) {
let fiber = {
+ ident: this.fiberList.length + 1,
bushColor: a.color,
color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
- model: model,
- standard: standard,
- productList: this.HaveJson(this.productList)
+ model: null,
+ noSplitModel: null,
+ standard: null,
+ fibersIdent: a.ident,
+ productList: []
}
- a.fiber.push(fiber)
this.fiberList.push(fiber)
}
})
@@ -611,85 +900,321 @@
a.fiber = []
for (var i = 0; i < parseInt(a.testNum); i++) {
let fiber = {
+ ident: this.fiberList.length + 1,
bushColor: a.color,
color: colors2[(i+(parseInt(a.testNum))*index)>colors2.length?0:i+(parseInt(a.testNum))*index].label,
- model: model,
- standard: standard,
- productList: this.HaveJson(this.productList)
+ model: null,
+ standard: null,
+ productList: []
}
- a.fiber.push(fiber)
this.fiberList.push(fiber)
}
})
}
+ }else {
+ this.fiberList = []
+ let flag = true
+ // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
+ let colors2 = []
+ if (this.packageInfo.num1 / this.colors.length > 1) {
+ let num = this.packageInfo.num1 / this.colors.length
+ if (this.packageInfo.num1 % this.colors.length > 0) num += 1
+ for (var i = 0; i < num; i++) {
+ colors2 = colors2.concat(this.colors)
+ }
+ } else {
+ colors2 = colors2.concat(this.colors)
+ }
+ // 鏍规嵁濂楃鐨勬祴璇曢噺鐢熸垚瀵瑰簲鐨勬暟閲忕殑鍏夌氦鏁版嵁
+ this.selectBushing.forEach((item,index) =>{
+ if(item.testNum != null && item.testNum != ''){
+ for(let i =0; i < parseInt(item.testNum); i++){
+ let fiber = {
+ ident: this.fiberList.length + 1,
+ bushColor: item.color,
+ color: colors2[(i+(parseInt(item.testNum)*index))>colors2.length?0:i+(parseInt(item.testNum)*index)*index].label,
+ model: null,
+ standard: null,
+ productList: []
+ }
+ this.fiberList.push(fiber)
+ }
+ }else {
+ flag = false
+ }
+ })
+ if(!flag){
+ this.$message.error('璇峰～鍐欏厜绾ゆ娴嬮噺')
+ return
+ }
+ }
+ // 浜屼唬
+ // // 鏄惁閫夋嫨濂楃
+ // if(this.selectBushing.length == 0) {
+ // this.$message.error('鏈�夋嫨濂楃')
+ // return
+ // }
+ // this.fiberList = []
+ // let flag = true
+ // // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
+ // let colors2 = []
+ // if (this.packageInfo.num1 / this.colors.length > 1) {
+ // let num = this.packageInfo.num1 / this.colors.length
+ // if (this.packageInfo.num1 % this.colors.length > 0) num += 1
+ // for (var i = 0; i < num; i++) {
+ // colors2 = colors2.concat(this.colors)
+ // }
+ // } else {
+ // colors2 = colors2.concat(this.colors)
+ // }
+ // // 鏍规嵁濂楃鐨勬祴璇曢噺鐢熸垚瀵瑰簲鐨勬暟閲忕殑鍏夌氦鏁版嵁
+ // this.selectBushing.forEach((item,index) =>{
+ // if(item.testNum != null && item.testNum != ''){
+ // for(let i =0; i < parseInt(item.testNum); i++){
+ // let fiber = {
+ // ident: this.fiberList.length + 1,
+ // bushColor: item.color,
+ // color: colors2[(i+(parseInt(item.testNum)*index))>colors2.length?0:i+(parseInt(item.testNum)*index)*index].label,
+ // model: null,
+ // standard: null,
+ // productList: []
+ // }
+ // this.fiberList.push(fiber)
+ // }
+ // }else {
+ // flag = false
+ // }
+ // })
+ // if(!flag){
+ // this.$message.error('璇峰～鍐欏厜绾ゆ娴嬮噺')
+ // return
+ // }
+
+
+ // 鏈�鍒�
+ // let colors2 = []
+ // if (this.packageInfo.num1 / this.colors.length > 1) {
+ // let num = this.packageInfo.num1 / this.colors.length
+ // if (this.packageInfo.num1 % this.colors.length > 0) num += 1
+ // for (var i = 0; i < num; i++) {
+ // colors2 = colors2.concat(this.colors)
+ // }
+ // } else {
+ // colors2 = colors2.concat(this.colors)
+ // }
+ // this.fiberList = []
+ // let model = this.mireModel.split(' - ')[1]
+ // let standard = this.mireStandards.find(a => a.id == this.mireStandard).code
+ // if (this.packageInfo.ismiers) {
+ // if(this.selectFibers.length === 0){
+ // this.$message.error('鏈�夋嫨鍏夌氦甯�')
+ // return
+ // }
+ // this.selectFibers.forEach((a,index) => {
+ // a.fiber = []
+ // for (var i = 0; i < parseInt(a.num); i++) {
+ // let fiber = {
+ // bushColor: a.color,
+ // color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
+ // model: model,
+ // standard: standard,
+ // productList: this.HaveJson(this.productList)
+ // }
+ // a.fiber.push(fiber)
+ // this.fiberList.push(fiber)
+ // }
+ // })
+ // } else {
+ // this.selectBushing.forEach((a,index) => {
+ // a.fiber = []
+ // for (var i = 0; i < parseInt(a.testNum); i++) {
+ // let fiber = {
+ // bushColor: a.color,
+ // color: colors2[(i+(parseInt(a.testNum))*index)>colors2.length?0:i+(parseInt(a.testNum))*index].label,
+ // model: model,
+ // standard: standard,
+ // productList: this.HaveJson(this.productList)
+ // }
+ // a.fiber.push(fiber)
+ // this.fiberList.push(fiber)
+ // }
+ // })
+ // }
},
addFibers() {
- if(this.selectBushing.length===0){
+ // if(this.selectBushing.length===0){
+ // this.$message.error('鏈�夋嫨濂楃')
+ // return
+ // }
+ // this.fibersList = []
+ // let standard = this.miresStandards.find(a => a.id == this.miresStandard).code
+ // this.packageInfo.ismiers = true
+ // this.fiberList = []
+ // this.selectBushing.forEach(a => {
+ // a.fiber = []
+ // a.fibers = []
+ // for (var i = 0; i < parseInt(a.testNum); i++) {
+ // let fibers = {
+ // code: null,
+ // color: a.color,
+ // model: this.miresModel,
+ // standard: standard,
+ // num: a.testNum,
+ // productList: this.HaveJson(this.productList2),
+ // fiber: []
+ // }
+ // a.fibers.push(fibers)
+ // this.fibersList.push(fibers)
+ // }
+ // })
+
+ if(this.selectBushing.length == 0) {
this.$message.error('鏈�夋嫨濂楃')
return
}
+ // 濂楃鐨勬祴璇曢噺 * 閫夋嫨鐨勫厜绾ゅ甫鏁伴噺
this.fibersList = []
- let standard = this.miresStandards.find(a => a.id == this.miresStandard).code
- this.packageInfo.ismiers = true
- this.fiberList = []
- this.selectBushing.forEach(a => {
- a.fiber = []
- a.fibers = []
- for (var i = 0; i < parseInt(a.testNum); i++) {
- let fibers = {
- code: null,
- color: a.color,
- model: this.miresModel,
- standard: standard,
- num: a.testNum,
- productList: this.HaveJson(this.productList2),
- fiber: []
- }
- a.fibers.push(fibers)
- this.fibersList.push(fibers)
+ this.selectBushing.forEach(item => {
+ for(let i = 0; i < parseInt(this.packageInfo.testNum); i++){
+ let fibers = {
+ ident: this.fibersList.length + 1,
+ color: item.color,
+ code: null,
+ model: null,
+ standard: null,
+ num: null,
+ fiber: [],
+ productList: []
}
+ this.fibersList.push(fibers)
+ }
})
},
rowClickFiber(row, column, event,type){
- this.type = type
- if(this.active===1){
- if(type==0){
- let standard = null;
- try{
- standard = this.miresStandards.find(a => a.id == this.miresStandards)
- }catch(e){}
- if(standard&&standard.code=='濮旀墭瑕佹眰'){
- this.isAskOnlyRead = false;
- }else{
- this.isAskOnlyRead = true;
- }
- }else{
- let standard = null;
- try{
- standard = this.mireStandards.find(a => a.id == this.mireStandard)
- }catch(e){}
- if(standard&&standard.code=='濮旀墭瑕佹眰'){
- this.isAskOnlyRead = false;
- }else{
- this.isAskOnlyRead = true;
- }
- }
+ console.log('row',row);
+ // this.type = type
+ // if(this.active===1){
+ // if(type==0){
+ // let standard = null;
+ // try{
+ // standard = this.miresStandards.find(a => a.id == this.miresStandards)
+ // }catch(e){}
+ // if(standard&&standard.code=='濮旀墭瑕佹眰'){
+ // this.isAskOnlyRead = false;
+ // }else{
+ // this.isAskOnlyRead = true;
+ // }
+ // }else{
+ // let standard = null;
+ // try{
+ // standard = this.mireStandards.find(a => a.id == this.mireStandard)
+ // }catch(e){}
+ // if(standard&&standard.code=='濮旀墭瑕佹眰'){
+ // this.isAskOnlyRead = false;
+ // }else{
+ // this.isAskOnlyRead = true;
+ // }
+ // }
+ // }
+ // if(this.type==1){
+ // if (this.active !== 1) {
+ // this.sampleIds = []
+ // this.sampleIds.push(row.id)
+ // }
+ // }
+ // this.currentDetectionItems = row
+ // this.detectionItems = row.productList
+ // if(this.detectionItems === null) return
+ // setTimeout(() => {
+ // this.detectionItems.forEach(a => {
+ // if (a.state == 1) this.toggleSelection(a)
+ // })
+ // }, 200)
+ if(type == 1) {
+ if(row.model != null && row.model != ''){
+ this.miresModel = row.model
+ this.selectsStandardMethodByFLSSM2()
}
- if(this.type==1){
- if (this.active !== 1) {
- this.sampleIds = []
- this.sampleIds.push(row.id)
- }
- }
- this.currentDetectionItems = row
- this.detectionItems = row.productList
- if(this.detectionItems === null) return
setTimeout(() => {
- this.detectionItems.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
+ if(row.standard !=null && row.standard != ''){
+ this.miresStandard = this.miresStandards.find(a => a.code == row.standard).id
+ }
+ this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ model: '',
+ standardMethodListId: this.miresStandard,
+ factory: '涓ぉ绉戞妧妫�娴嬩腑蹇� - 閫氫俊浜у搧瀹為獙瀹� - 鍏夌氦甯� - ' + this.miresModel + ' - ',
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ // 灏嗚幏鍙栫殑妫�娴嬮」淇℃伅璧嬪��
+ this.detectionItems = []
+ if(res.data != null && res.data.length != 0){
+ res.data.forEach(a => {
+ a.state = 0
+ })
+ this.detectionItems = res.data
+ this.detectionType = 1
+ this.$set(this.detectionItems,'type',1)
+
+ if (row.productList != null && row.productList.length > 0) {
+ setTimeout(() => {
+ row.productList.forEach(product => {
+ let rowToSelect = this.detectionItems.find(item => item.id === product.id);
+ if (rowToSelect) {
+ this.toggleSelection(rowToSelect);
+ }
+ });
+ },200)
+
+ }
+ }
+ })
+ },1000)
+ }else if(type == 0) {
+ if(row.model != null && row.model != ''){
+ this.mireModel = row.noSplitModel
+ this.selectsStandardMethodByFLSSM()
+ }
+ setTimeout(() => {
+ if(row.standard !=null && row.standard != ''){
+ this.mireStandard = this.mireStandards.find(a => a.code == row.standard).id
+ }
+ this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ model: this.mireModel.split(' - ')[1],
+ standardMethodListId: this.mireStandard,
+ factory: ''
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.detectionItems = []
+ if(res.data != null && res.data.length != 0){
+ res.data.forEach(a => {
+ a.state = 0
})
- }, 200)
- },
+ this.detectionItems = res.data
+ this.detectionType = 0
+ this.$set(this.detectionItems,'type',0)
+
+ if (row.productList != null && row.productList.length > 0) {
+ setTimeout(() => {
+ row.productList.forEach(product => {
+ let rowToSelect = this.detectionItems.find(item => item.id === product.id);
+ if (rowToSelect) {
+ this.toggleSelection(rowToSelect);
+ }
+ });
+ },200)
+ }
+ }
+
+ })
+ },1000);
+ }
+ },
toggleSelection(row) {
this.$refs.productTable.toggleRowSelection(row, true);
},
@@ -704,6 +1229,7 @@
},
handleAll(e) {
if (e.length > 0) {
+ console.log(this.detectionItems);
this.detectionItems.map(m => {
m.state = 1
return m
@@ -881,16 +1407,40 @@
})
},
save(){
- if(this.bushing.length === 0){
- this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
- return
- }
+ // if(this.bushing.length === 0){
+ // this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
+ // return
+ // }
// for(let a in this.bushing){
// if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
// this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
// return
// }
// }
+ // this.sample.forEach(a=>{
+ // a.bushing = this.bushing
+ // })
+ // this.$message.success('宸蹭繚瀛�')
+ // this.$emit('saveFiberopticConfig')
+
+ if(this.bushing.length === 0){
+ this.$message.error('缂哄皯濂楃鏃犳硶淇濆瓨')
+ return
+ }
+ this.bushing.forEach(item=>{
+ // 濡傛灉鍏夌氦甯︽湁鍊�
+ if(this.fibersList.length != 0) {
+ this.fibersList.forEach(a=>{
+ a.fiber = this.fiberList.filter(b=>b.fibersIdent == a.ident)
+ })
+ item.fibers = this.fibersList // 鍏夌氦甯�
+ item.fiber = [] // 鍏夌氦
+ }else {
+ // 濡傛灉鍏夌氦甯︽病鏈夊��
+ item.fibers = [] // 鍏夌氦甯�
+ item.fiber = this.fiberList // 鍏夌氦
+ }
+ })
this.sample.forEach(a=>{
a.bushing = this.bushing
})
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 54643da..3e41e73 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -384,6 +384,7 @@
<template v-if="PROJECT=='妫�娴嬩腑蹇�'||PROJECT=='瑁呭鐢电紗'&&getInspectionValueType(n.i) != 2 ">
<span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
<span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
+ <span v-else-if="n.v.v===3" :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`">涓嶅垽瀹�</span>
<span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
</template>
</template>
@@ -612,6 +613,7 @@
<template slot-scope="scope">
<span v-if="scope.row.arr[index].insResult===1" style="color: green;">鍚堟牸</span>
<span v-else-if="scope.row.arr[index].insResult===0" style="color: red;">涓嶅悎鏍�</span>
+ <span v-else-if="scope.row.arr[index].insResult===3" style="color: #3A7BFA;">涓嶅垽瀹�</span>
<span v-else>寰呭畾</span>
</template>
</el-table-column>
@@ -691,6 +693,7 @@
<template v-else>
<span v-if="item.insResult===1" style="color: green;">鍚堟牸</span>
<span v-else-if="item.insResult===0" style="color: red;">涓嶅悎鏍�</span>
+ <span v-else-if="item.insResult===3" style="color: #3A7BFA;">涓嶅垽瀹�</span>
<span v-else>寰呭畾</span>
</template>
</td>
@@ -943,6 +946,7 @@
requiredUp: []
},
upIndex: 0,
+ changeType:null,
getReportModelLoading:false,
insOrder: {},
sampleProduct: [],
@@ -1110,15 +1114,18 @@
}
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
- // console.log(this.currentSample)
+ this.param = {}
+ this.changeType = 0;
this.currentSample.insProduct.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
+ if(this.handleCasing(a.inspectionItem)){
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
}
})
this.determineWhetherToCollectData()
@@ -1150,22 +1157,24 @@
}
return
}
- if(this.changeType&&changeType>0){
+ if(this.changeType&&this.changeType>0){
return
}
this.tableLists.forEach(async (m, i) => {
if (m.templateId == val1) {
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
- // console.log(this.currentSample)
+ this.param = {}
this.currentSample.insProduct.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
+ if(this.handleCasing(a.inspectionItem)){
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
}
})
this.getReportModel(this.currentSample.id)
@@ -1194,7 +1203,6 @@
}
}
})
- this.handleCasing()
}
},
equipForm:{
@@ -1356,7 +1364,6 @@
maxNum = num
}
}
- console.log('data[i][j].equipName',data[i][j].equipName,'data[i][j].equipValue',data[i][j].equipValue,'m.v',m.v,'m.v.ps',m.v.ps,'m.v.ps.value',m.v.ps.value,'str0',str0,'str',str,'m.v.v',m.v.v)
if(data[i][j].equipName&&data[i][j].equipValue&&m.v&&m.v.ps&&m.v.ps.value=='璁惧缂栫爜'&&str0==str){
if(!m.v.v){
this.changeEquip(data[i][j].equipValue,m,data[i][j].equipName)
@@ -2054,15 +2061,18 @@
this.currentSample = this.HaveJson(row)
let list = await this.getCurrentProduct(row.id,0)
this.currentSample.insProduct = this.HaveJson(list)
- this.handleCasing()
+ this.param = {}
+ this.changeType = 0;
this.currentSample.insProduct.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
+ if(this.handleCasing(a.inspectionItem)){
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
}
})
this.getReportModel(row.id)
@@ -2081,9 +2091,15 @@
currentTable:this.currentTable
}));
},
- handleCasing(){
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='鎴愬搧缂嗘楠屽師濮嬭褰�')){
- this.currentSample.insProduct = this.currentSample.insProduct.filter(m=>!m.inspectionItem.includes('鏉惧绠�'))
+ handleCasing(inspectionItem){
+ if(this.changeType!=3){
+ if(inspectionItem.includes('鏉惧绠�')){
+ return false
+ }else{
+ return true
+ }
+ }else{
+ return true
}
},
getReportModel(id){
@@ -2103,6 +2119,7 @@
if(m){
let list = await this.getCurrentProduct(m,type)
if(list.length>0){
+ this.param = {}
list.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -2652,6 +2669,26 @@
// return
// }
// }
+ let str = code.split('-')
+ let pId = str[3]
+ for(let i =0;i<this.currentSample.insProduct.length;i++){
+ if(this.currentSample.insProduct[i].id==pId&&(this.currentSample.insProduct[i].ask=='-'||this.currentSample.insProduct[i].ask=='/')){
+ this.tableList[0].arr.forEach(item=>{
+ item.forEach(m=>{
+ if(m.i==pId&&m.v.ps&&m.v.ps.value=='缁撹'){
+ this.$set(m.v,'v',3)
+ }
+ })
+ })
+ if(this.param[pId].insResult&&this.param[pId].insResult.v){
+ this.param[pId].insResult.v.v = 3
+ }
+ this.saveInsContext()
+ return
+ }
+ }
+ // this.currentTable.
+ // if(!this.param[pId].equipValue||this.param[pId].equipValue.length==0||!this.param[pId].equipValue[0].v.v){}
if (n) {
// if (this.PROJECT === '瑁呭鐢电紗') {
// let num2 = new this.$Big(n.v.v)
@@ -3222,16 +3259,18 @@
this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
- this.handleCasing()
this.param = {}
+ this.changeType = 0;
this.currentSample.insProduct.forEach(a => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null
+ if(this.handleCasing(a.inspectionItem)){
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
}
})
this.getTableLists()
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index d9df2a2..200cd41 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -124,17 +124,17 @@
<el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
</el-table-column>
<el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :isShowZero="isShowZero"
- v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
+ v-for="(a, ai) in tableHead" :key="ai+'bbbbb'" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
<template slot-scope="scope">
<div v-if="showType(a.label, data.tagField) != null">
<template v-if="typeof(scope.row[a.label]) == 'object'">
<template v-for="(param, i) in scope.row[a.label]">
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == param"
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'cccc'" v-if="b.value == param"
:type="b.type" size="medium" style="margin-right: 5px;">{{b.label}}</el-tag>
</template>
</template>
<template v-else>
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
+ <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'ddddd'" v-show="b.value == scope.row[a.label]"
:type="b.type" size="medium">{{b.label}}</el-tag>
</template>
</div>
@@ -148,7 +148,8 @@
</el-table-column>
<el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()" v-if="data.do.length > 0">
<template slot-scope="scope">
- <el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type"
+ <el-button v-for="(a, ai) in data.do" :key="ai
+ +'qqqq'" :type="a.type"
:disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" @click="main(scope.row, a)"
class="handleBtn">
<span v-if="a.type!='upload'">{{a.font}}</span>
@@ -172,7 +173,7 @@
<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
<div class="body" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
<div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <div v-for="(a, ai) in upHead" :key="ai+'ffff'" style="line-height: 50px;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1">
<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
</el-col>
@@ -183,7 +184,7 @@
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'eeeee'" :value="b.value"
:label="b.label">
</el-option>
</el-select>
@@ -204,7 +205,7 @@
</div>
</div>
<div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <el-row v-for="(a, ai) in upHead" :key="ai+'ggggg'" style="line-height: 50px;">
<el-col :span="6" style="text-align: right;">
<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
</el-col>
@@ -215,7 +216,7 @@
<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'fffff'" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)" :multiple="false"
@@ -241,7 +242,7 @@
<el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body>
<div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
<div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <div v-for="(a, ai) in upHead" :key="ai+'yyyyy'" style="line-height: 50px;">
<el-col :span="6/data.row" style="text-align: right;" :offset="1"><span class="required-span"
v-if="showAddReq(a.label)">*
</span>{{a.value}}锛�</el-col>
@@ -251,7 +252,7 @@
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
:multiple="data.selectField[a.label].choose"
style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'hhhh'" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
@@ -270,7 +271,7 @@
</div>
</div>
<div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+ <el-row v-for="(a, ai) in upHead" :key="ai+'jjjjj'" style="line-height: 50px;">
<el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">*
</span>{{a.value}}锛�</el-col>
<el-col :span="16" :offset="1">
@@ -279,7 +280,7 @@
<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
:multiple="data.selectField[a.label].choose"
style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+ <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'mmmmmm'" :value="b.value"
:label="b.label"></el-option>
</el-select>
<el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 05c0f51..c20f6ed 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -345,7 +345,7 @@
type: 'text',
method: 'claimFun',
disabFun: (row, index) => {
- return row.userName != null||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
+ return row.userName != null || row.checkName!=null
}
}
],
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index a1517d9..442b29e 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -234,12 +234,11 @@
</div>
<div class="table">
<ul class="tab">
- <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
+ <li v-for="(m,i) in tabList" :key="i+'afgh'" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
</ul>
<ValueTable :style="getStyle()" ref="ValueTable"
- :isColumnWidth="true"
:url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
- :key="'b'+upIndex" />
+ :upIndex="upIndex" />
</div>
<!-- 瀹℃牳 -->
<el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -297,7 +296,7 @@
<div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
<el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable @change="changeUser">
- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
+ <el-option v-for="(item,i) in personList" :key="i+'gbnm.'" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -306,7 +305,7 @@
<div class="search_label"><span class="required-span" >* </span>璇曢獙瀹わ細</div>
<div class="search_input">
<el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable>
- <el-option v-for="(item,i) in sonLaboratoryList" :key="i" :label="item.label" :value="item.value">
+ <el-option v-for="(item,i) in sonLaboratoryList" :key="i+'oooo'" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -351,7 +350,7 @@
v-model="checkAll"
@change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
<el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
- <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
+ <el-card class="box-card" v-for="(item, i) in qrData" :key="i+'wwwww'" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
<div>
<el-row style="font-size: 14px;padding-left: 20px;">
@@ -402,7 +401,7 @@
</el-dialog>
<div class="el-dialog__body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;display: none;">
<div id="printMOrder" class="printMOrder" ref="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.20cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" style="font-size: 0.20cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
<div style="display: flex;">
<div>
<el-col :span="10" :offset="2">
@@ -1117,7 +1116,8 @@
handleTab(m, i) {
this.tabIndex = i;
this.componentData.entity.state = m.value
- this.refreshTable()
+ this.refreshTable('page')
+ this.upIndex++
},
getUserMenu() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
diff --git a/static/js/worker.js b/static/js/worker.js
index c3336df..f8d2e8d 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -361,7 +361,7 @@
a[b].v.v = isNaN(val) ? comResult : val
}
// console.log('a[b].v.ct', comResult)
- // console.log('a[b].v.v', a[b].v.v)
+ // console.log('a[b].v.v', a[b])
}catch(error){
a[b].v.v = comResult
console.log('error---', error)
@@ -486,7 +486,7 @@
b.i &&b.v.v&& param[b.i].insValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
- b.i &&b.v.v&& param[b.i].comValue.push(b)
+ b.i &&b.v.v&&b.valueList&&b.valueList.length>0&& param[b.i].comValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
b.i &&b.v&& param[b.i].equipValue.push(b)
@@ -495,7 +495,7 @@
b.i &&b.v&& param[b.i].equipName.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
- b.i &&b.v&& (param[b.i].resValue = b)
+ b.i &&b.v&&b.valueList&&b.valueList.length>0&& (param[b.i].resValue = b)
}
if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
if(b.i &&(b.v.v||b.v.v===0||b.v.v==='0')){
@@ -519,7 +519,7 @@
function SUM(...val){
try {
let num = null;
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
val.forEach(item=>{
num+=item;
})
@@ -538,7 +538,7 @@
function MAX(...val){
try {
let max = null;
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
val = val.filter(item=>item!=null&&item!=='')
if(val.length>0){
max = Math.max(...val)
@@ -560,7 +560,7 @@
function MIN(...val){
try {
let min = null;
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
val = val.filter(item=>item!=null&&item!=='')
if(val.length>0){
min = Math.min(...val)
@@ -581,7 +581,7 @@
try {
let num = null;
let arr = [];
- if(val!=null&&val!=undefined&&val!='undefined'&&val.length>0){
+ if(val!=null&&val!=undefined&&val!='undefined'&&val!='NaN'&&val.length>0){
arr = val.filter(item=>item!==null&&item!==''&&item!=undefined)
arr.forEach(item=>{
num+=item;
@@ -884,7 +884,7 @@
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
- console.log('str', str,eval(str))
+ console.log('str', str)
return eval(str)
}
} catch (error) {
--
Gitblit v1.9.3