From b9e6b361bdb8cd26b9768602734b3a078dcdee26 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 12:18:14 +0800
Subject: [PATCH] 修改检验任务bug
---
src/components/do/b1-ins-order/add.vue | 345 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 289 insertions(+), 56 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index f350fbc..650f2f4 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -74,18 +74,18 @@
display: flex;
flex-direction: row;
justify-content: space-between;
- .opticalProject {
- width: 38%;
- }
- .temperatureList {
- width: 60%;
- .temperatureListTitle {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- line-height: 30px;
- }
- }
+ }
+ .opticalProject {
+ width: 38%;
+ }
+ .temperatureList {
+ width: 60%;
+ }
+ .temperatureListTitle {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ line-height: 30px;
}
</style>
<style>
@@ -118,7 +118,7 @@
}
.ins_order_add .el-table .warning-row .cell {
- color: #bababa;
+ color: #3A7BFA;
}
.ins_order_add .el-select .is-disabled {
@@ -458,6 +458,8 @@
</div>
</template>
</el-table-column>
+ <el-table-column prop="inspectionItemClass" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemClassEn" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被(EN)" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" min-width="130" show-overflow-tooltip :filters="filters"
:filter-method="filterHandler"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
@@ -479,10 +481,10 @@
<el-table-column prop="manHour" label="宸ユ椂绯绘暟" width="100" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="deviceGroup" label="璁惧缁�" width="120" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="section" label="鍖洪棿" min-width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
+ <el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px" v-if="isAskOnlyRead">
<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)"
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'ask')"
v-if="active==1&&isAskOnlyRead"></el-input>
<span v-else>
<!-- <template v-if="(scope.row.ask.indexOf('D')>-1
@@ -495,6 +497,16 @@
</template>
<template v-else>{{ scope.row.ask }}</template> -->
<template >{{ scope.row.ask }}</template>
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
+ <template slot-scope="scope">
+ <el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable type="textarea"
+ :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'tell')"
+ v-if="active==1&&isAskOnlyRead"></el-input>
+ <span v-else>
+ <template >{{ scope.row.tell }}</template>
</span>
</template>
</el-table-column>
@@ -563,8 +575,17 @@
<el-col class="search_thing" :span="22">
<div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;">
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;" @change="changeUser">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22" v-if="distributeData.userId">
+ <div class="search_label"><span class="required-span">* </span>璇曢獙瀹わ細</div>
+ <div class="search_input">
+ <el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;">
+ <el-option v-for="item in sonLaboratoryList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -600,20 +621,20 @@
<equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
<cableConfig v-if="cableConfigShow" :active="active" />
<!-- 鍗曢�夌壒娈婂�煎鐞嗘-->
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :show-close="false"
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" min-width="400px" :show-close="false"
:before-close="beforeClose">
<div class="body" style="max-height: 60vh;">
<el-row v-if="bsm1">
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="bsm1Val" @input="upBsm1">
<el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
</el-radio-group>
</div>
</el-col>
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label">瑕佹眰鍊硷細</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</div>
<div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
<el-radio-group v-model="bsm1Val" @input="upBsm1">
<el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
@@ -662,20 +683,20 @@
</div>
</el-dialog>
<!-- 鍏ㄩ�夌壒娈婂�煎鐞嗘-->
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" width="500px" :show-close="false"
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" min-width="400px" :show-close="false"
:before-close="beforeClose">
<div class="body" style="max-height: 60vh;" v-for="(item, index) in bsm1DiaList" :key="index">
<el-row v-if="item.bsm1">
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
</el-radio-group>
</div>
</el-col>
- <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
- <div class="search_label">瑕佹眰鍊硷細</div>
+ <el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
+ <div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</div>
<div class="search_input" v-show="item.bsm1Val!==null&&item.bsm1Val!==''">
<el-radio-group v-model="item.bsm1Val" @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.section)" :key="ai"
@@ -802,7 +823,7 @@
</div>
<div class="temperatureList">
<div class="temperatureListTitle">
- <span>娓╁害鐐归泦鍚�(璇锋寜鐓ч『搴忓～鍐欙紝20鈩冨繀椤讳负棣栦綅)</span>
+ <span>娓╁害鐐归泦鍚�</span>
<span>
<el-button type="primary" size="mini" @click="addTemperatureData">鏂板</el-button>
<el-button size="mini" @click="deleteTemperatureData">鍒犻櫎</el-button>
@@ -834,7 +855,25 @@
</div>
</div>
<span slot="footer" class="dialog-footer">
+ <el-button @click="cleanSpliceData">鍙栨秷</el-button>
<el-button type="primary" @click="spliceData">淇濆瓨</el-button>
+ </span>
+ </el-dialog>
+ <!-- 鐢靛姏璇曢獙瀹�---娓╁崌璇曢獙/鐑惊鐜� -->
+ <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
+ <div>
+ <div v-if="isShowInput" style="margin-bottom: 6px">
+ <span>寰幆娆℃暟:</span>
+ <!-- <el-input size="small" type="number" v-model="temperatureTestNum" style="width: 120px"></el-input> -->
+ <el-input-number v-model="temperatureTestNum" :min="2" :max="1000000" size="small" label=""></el-input-number>
+ </div>
+ <el-checkbox-group v-model="temperatureTest" @change="handleTemperatureTestChange" style="display: flex;flex-direction: column;">
+ <el-checkbox v-for="item in temperatureList" :label="item" :key="item" style="margin-bottom: 6px">{{item}}</el-checkbox>
+ </el-checkbox-group>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="cleanTemperatureTest">鍙栨秷</el-button>
+ <el-button type="primary" @click="spliceTemperatureTest">淇濆瓨</el-button>
</span>
</el-dialog>
</div>
@@ -965,7 +1004,8 @@
issuedDialogVisible: false,
distributeData: {
appointed: '',
- userId: ''
+ userId: '',
+ sonLaboratory:''
},
personList: [],
upLoad: false,
@@ -1024,7 +1064,16 @@
{label: '=', value: '='},
{label: '鈮�', value: '鈮�'},
{label: '>', value: '>'},
- ]
+ ],
+ temperatureShow: false, // 娓╁崌璇曢獙妫�楠岄」寮规
+ temperatureTest: [],
+ temperatureList: [],
+ temperatureEngList: [],
+ temperatureTitle: '',
+ temperatureTestNum: '',
+ isShowInput: false,
+ temId: '',
+ sonLaboratoryList:[]
}
},
watch: {
@@ -1068,7 +1117,7 @@
this.selectEnumByCategoryForType()
this.getUserNow()
this.selectStandardTreeList()
- this.selectInsOrderTemplate()
+ // this.selectInsOrderTemplate()
this.getAuthorizedPerson();
this.selectEnumByCategoryForUnit()
this.selectStandardMethods()
@@ -1112,6 +1161,9 @@
throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
}
})
+ if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
+ throw this.$message.error(`${o.value + '娉㈤暱娌℃湁閰嶇疆20鈩冩俯搴︾偣'}`)
+ }
})
let entrustTime = this.circulateForm.entrustTime
let entrustNum = this.circulateForm.entrustNum
@@ -1123,7 +1175,7 @@
o.temperatureData.unshift({temperaturePoint: 20})
o.temperatureData.forEach(t => {
if (!t.askSymbol) {
- const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + null
+ const askObj = t.temperaturePoint + '鈩�(甯告俯)' + ',' + o.value + ',' + null
askArr.push(askObj)
} else {
const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + t.askSymbol + t.askNum
@@ -1149,7 +1201,7 @@
})
temperaturePointList = Array.from(new Set(temperaturePointList))
temperaturePointList2 = Array.from(new Set(temperaturePointList2))
- temperaturePointList2.unshift(20 + '鈩�')
+ temperaturePointList2.unshift(20 + '鈩�(甯告俯)')
let additionArr = []
askNum.forEach(a => {
additionArr.push(temperaturePointList.join(',') + a)
@@ -1163,21 +1215,93 @@
item.tell = tell
}
})
- console.log('ask---', ask)
- console.log('tell---', tell)
+ this.circulateShow = false
+ },
+ spliceTemperatureTest () {
+ if (this.temperatureTest.length === 0) {
+ this.$message.error('璇烽�夋嫨')
+ return
+ }
+ let askStr = ''
+ let askArr1 = []
+ let askArr2 = ''
+ let ask = ''
+ let index = ''
+ this.temperatureTest.map(val => {
+ index = this.temperatureEngList.findIndex(item => item.label === val)
+ if (index > -1) {
+ askStr = val + ',' + this.temperatureEngList[index].value
+ }
+ askArr1.push(askStr)
+ })
+
+ if (this.temperatureTitle === '娓╁崌璇曢獙瑕佹眰濉啓') {
+ askArr2 = askArr1.join(';')
+ ask = askArr2 + ';1'
+ } else {
+ if (!this.temperatureTestNum) {
+ this.$message.error('璇峰～鍐欏惊鐜鏁�')
+ return
+ }
+ askArr2 = askArr1.join(';')
+ ask = askArr2 + ';' + this.temperatureTestNum
+ }
+ this.productList.forEach(item => {
+ if (item.id === this.temId) {
+ item.ask = ask
+ item.tell = ask
+ }
+ })
+ // console.log('ask---', ask)
+ this.temperatureShow = false
+ },
+ temperatureShowClose () {
+ if (this.temperatureTitle === '鐑惊鐜姹傚～鍐�' && !this.temperatureTestNum) {
+ this.$message.error('璇峰～鍐欏惊鐜鏁�')
+ return
+ }
+ if (this.temperatureTest.length === 0) {
+ this.$message.error('璇烽�夋嫨')
+ return
+ }
+ this.spliceTemperatureTest()
+ },
+ cleanTemperatureTest () {
+ this.temperatureTest = []
+ this.temperatureTestNum = ''
+ this.temperatureShow = false
+ },
+ cleanSpliceData () {
+ this.circulateForm.entrustNum = null
+ this.circulateForm.entrustTime = null
+ this.circulateForm.entrustPoint = null
+ this.opticalProjectList = []
+ this.$refs.multipleTable.clearSelection()
+ this.temperatureData = []
this.circulateShow = false
},
beforeCirculateShowClose () {
- if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
- this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
- return
- }
- let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))
- temperaturePoint1.forEach(t => {
- if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
- throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
+ this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ return
}
- })
+ // 鎷兼帴瑕佹眰鍊糰sk
+ const opticalProjectList = JSON.parse(JSON.stringify(this.opticalProjectList))
+ opticalProjectList.forEach(o => {
+ o.temperatureData.forEach(t => {
+ if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
+ throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
+ if (!o.temperatureData.some(item => item.temperaturePoint == '20')) {
+ throw this.$message.error(`${o.value + '娉㈤暱娌℃湁閰嶇疆20鈩冩俯搴︾偣'}`)
+ }
+ })
+ this.spliceData()
+ },
+
+ handleTemperatureTestChange (value) {
+ // console.log('value---', value)
},
handleSelectionChange(val) {
this.opticalProjectList = val;
@@ -1289,6 +1413,10 @@
this.addObj.code = selects.code
this.addObj.companyId = selects.id
this.selectUserDia = false
+ if(this.active==1){
+ // TODO
+ this.selectInsOrderTemplate()
+ }
},
containsValue(str) {
if(str){
@@ -1374,9 +1502,14 @@
isHaveBushing = false
}
})
- console.log('isHaveBushing===', isHaveBushing)
+ // console.log('isHaveBushing===', isHaveBushing)
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
+
+ this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
+ this.rowClick(this.currentMethod)
+ this.sampleIds = [this.currentMethod.id]
+ this.openConfig()
return
}
let sampleList = this.HaveJson(this.sampleList)
@@ -1622,9 +1755,22 @@
str: JSON.stringify({
insOrder: this.addObj,
list: JSON.stringify(sampleList.map(a => {
- a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ?
- '' : (
- '-' + a.modelNum))
+ if (this.PROJECT === '瑁呭鐢电紗') {
+ if (a.modelNum) {
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
+ } else {
+ a.model = a.modelNum + a.model
+ }
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
a.insProduct = a.insProduct.filter(b=>b.state === 1)
return a
})),
@@ -1695,11 +1841,16 @@
this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
return
}
+ if (this.distributeData.userId&&(this.distributeData.sonLaboratory== null ||this.distributeData.sonLaboratory== '')) {
+ this.$message.error('璇曢獙瀹ゆ湭濉啓')
+ return
+ }
this.upLoad = true;
this.$axios.post(this.$api.insOrder.upInsOrder, {
orderId: this.distributeData.orderId,
appointed: this.distributeData.appointed,
- userId: this.distributeData.userId
+ userId: this.distributeData.userId,
+ sonLaboratory:this.distributeData.sonLaboratory
}).then(res => {
if (res.code === 201) {
this.upLoad = false
@@ -1726,6 +1877,9 @@
this.addObj.companyId = selects.departId
this.addObj.production = '/'
this.addObj.productionEn = '/'
+ if(this.active==1){
+ this.selectInsOrderTemplate()
+ }
})
},
getProNum() {
@@ -1909,15 +2063,30 @@
upProductSelect(selection, row) {
this.bsm1DiaList = []
row.state = row.state == 1 ? 0 : 1
- if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
+ let arr = this.productList.filter(m=>m.state==1&&row.section.includes(m.section)&&m.ask&&m.section.indexOf('[')==-1)
+ if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1&&arr.length==0) {
if (row.section.indexOf('[') > -1) {
row.bsmRow = this.HaveJson(row)
}
row.bsm1 = true
this.bsm1DiaList.push(row)
this.bsm1DiaAll = true
- } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
+ } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0&&arr.length==0) {
row.bsm1 = false
+ }else if(arr.length>0){
+ row.bsmRow = this.HaveJson(row)
+ let section = arr[0].section
+ let arr0 = JSON.parse(row.section)
+ let arr1 = JSON.parse(row.ask)
+ let arr2 = JSON.parse(row.manHour)
+ let arr3 = JSON.parse(row.price)
+ let arr4 = JSON.parse(row.tell)
+ let index = arr0.indexOf(section)
+ row.section = section
+ row.ask = arr1[index]
+ row.manHour = arr2[index]
+ row.price = arr3[index]
+ row.tell = arr4[index]
}
if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
this.bsm2 = true
@@ -1962,6 +2131,16 @@
} else if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 0) {
this.circulateShow = false;
}
+ if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 1) {
+ // console.log('row---', row)
+ this.temperatureTitle = `${row.inspectionItem}瑕佹眰濉啓`
+ this.isShowInput = row.inspectionItem === '鐑惊鐜�'
+ this.temId = row.id
+ this.temperatureShow = true;
+ return
+ } else if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 0) {
+ this.temperatureShow = false;
+ }
this.getProNum()
},
searchProject () {
@@ -2003,12 +2182,12 @@
rowIndex
}) {
if (row.state === 0) {
- return 'warning-row';
+ return '';
}
- return '';
+ return 'warning-row';
},
selectInsOrderTemplate() {
- this.$axios.get(this.$api.insOrder.selectInsOrderTemplate).then(res => {
+ this.$axios.get(this.$api.insOrder.selectInsOrderTemplate+'?company='+this.addObj.company).then(res => {
if (res.code == 201) return
this.templates = res.data
})
@@ -2133,6 +2312,20 @@
}, 200)
})
this.searchProject()
+ this.searchTemList()
+ },
+ searchTemList () {
+ this.temperatureList = []
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鐢靛姏娓╁害寰幆妫�楠�"
+ }).then(res => {
+ if (res.data.length > 0) {
+ this.temperatureEngList = res.data
+ res.data.forEach(item => {
+ this.temperatureList.push(item.label)
+ })
+ }
+ })
},
changeModel() {
this.sampleList.forEach(a => {
@@ -2166,12 +2359,12 @@
}
},
// 瑕佹眰鍊煎彉鍖栨椂
- requestChange(e, row) {
+ requestChange(e, row,type) {
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
item.insProduct.map(m => {
if (m.id == row.id) {
- m.ask = e;
+ m[type] = e;
}
return m;
})
@@ -2192,9 +2385,12 @@
}
},
handleAll(e) {
+ // console.log('e---', e)
if (e.length > 0) {
this.productList.map(m => {
- m.state = 1
+ if(e.find(a=>a.id == m.id)){
+ m.state = 1
+ }
return m
})
} else {
@@ -2230,6 +2426,23 @@
this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
this.$refs.productTable.clearSelection()
return
+ }
+ const select = this.selectTree.split(' - ')
+ if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 1) {
+ this.circulateShow = true;
+ return
+ } else if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 0) {
+ this.circulateShow = false;
+ }
+ if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 1) {
+ // console.log('p---', p)
+ this.temperatureTitle = `${p.inspectionItem}瑕佹眰濉啓`
+ this.isShowInput = p.inspectionItem === '鐑惊鐜�'
+ this.temId = p.id
+ this.temperatureShow = true;
+ return
+ } else if ((p.inspectionItem === '娓╁崌璇曢獙' || p.inspectionItem === '鐑惊鐜�') && p.state === 0) {
+ this.temperatureShow = false;
}
/* if (p.ask.includes('RTS')&&p.state === 1) {
p.rts = ''
@@ -2505,6 +2718,7 @@
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 => {
@@ -2563,6 +2777,20 @@
arr0.forEach(item => {
this.total += Number(item.price)
})
+ let arr1 = this.totalArr.filter(item => item.state == 1)
+ let mySet0 = new Set();
+ this.sonLaboratoryList = []
+ arr1.forEach(item => {
+ let num1 = mySet0.size
+ mySet0.add(item.sonLaboratory)
+ let num2 = mySet0.size
+ if(num2>num1){
+ this.sonLaboratoryList.push({
+ label:item.sonLaboratory,
+ value:item.sonLaboratory,
+ })
+ }
+ })
},
bsm2Up(val) {
let list = []
@@ -2578,6 +2806,11 @@
for (let a of set) {
this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a - 1]))
}
+ },
+ changeUser(){
+ if(this.sonLaboratoryList.length>0){
+ this.distributeData.sonLaboratory = this.sonLaboratoryList[0].value
+ }
}
}
}
--
Gitblit v1.9.3