| src/assets/api/controller.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-ins-order/add.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-inspect-order-plan/Inspection.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/assets/api/controller.js
@@ -156,6 +156,7 @@ dataCollection: "/deviceScope/dataCollection", // 数采-数据采集 treeDevice: "/deviceScope/treeDevice", // 设备树形 temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000数采 temDataAcquisition2: "/deviceScope/temDataAcquisition2", // PK8000数采--多条 } const insOrder = { src/components/do/b1-ins-order/add.vue
@@ -164,7 +164,8 @@ </el-col> </el-row> </div> <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow"> <div style="height: (100vh - 200px);"> <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow"> <el-row> <el-col class="search_thing" :span="6"> <div class="search_label">委托编号：</div> @@ -511,6 +512,7 @@ </template> </el-table-column> </el-table> </div> </div> <el-dialog title="选择单位" :visible.sync="selectUserDia" width="70%"> <div class="body" style="height: 60vh;" v-if="selectUserDia"> @@ -1363,6 +1365,14 @@ this.temperatureData = this.temperatureData.slice(0,-deleteNum) } }, changeProductList0(){ this.productList0.forEach(a=>{ let obj = this.productList.find(m => m.id == a.id) if(obj){ a.state = obj.state } }) }, searchFilterList () { const vtw = { inspectionItem: this.inspectionItem, // 检验项 @@ -1372,6 +1382,7 @@ const isHaveValue = Object.values(vtw).some(item => { return item }) this.changeProductList0() if (isHaveValue) { for(let i in vtw) { if (vtw[i]) { @@ -1380,9 +1391,19 @@ }) } } this.$nextTick(()=>{ this.productList.forEach(a => { if (a.state == 1) this.toggleSelection(a) }) }) } else { // 没有查询条件时渲染所有数据 this.productList = this.productList0 this.$nextTick(()=>{ this.productList.forEach(a => { if (a.state == 1) this.toggleSelection(a) }) }) } }, getAuthorizedPerson() { @@ -2134,7 +2155,7 @@ return item }) const select = this.selectTree.split(' - ') if (row.inspectionItem === '温度循环' && select[2] === '光缆' && row.state === 1) { if (row.inspectionItem === '温度循环' && select[2] === '光缆' && row.state === 1&&this.isAskOnlyRead) { this.circulateShow = true; return } else if (row.inspectionItem === '温度循环' && select[2] === '光缆' && row.state === 0) { @@ -2150,6 +2171,8 @@ } else if ((row.inspectionItem === '温升试验' || row.inspectionItem === '热循环') && row.state === 0) { this.temperatureShow = false; } this.changeProductList0() this.currentMethod.insProduct = this.productList0 this.getProNum() }, searchProject () { @@ -2437,7 +2460,7 @@ return } const select = this.selectTree.split(' - ') if (p.inspectionItem === '温度循环' && select[2] === '光缆' && p.state === 1) { if (p.inspectionItem === '温度循环' && select[2] === '光缆' && p.state === 1&&this.isAskOnlyRead) { this.circulateShow = true; return } else if (p.inspectionItem === '温度循环' && select[2] === '光缆' && p.state === 0) { @@ -2482,6 +2505,8 @@ return item }) } this.changeProductList0() this.currentMethod.insProduct = this.productList0 this.getProNum() this.$nextTick(() => { this.$refs.productTable.doLayout() src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -318,7 +318,7 @@ </el-form-item> </el-form> <el-button type="primary" size="small" v-if="(dataAcquisitionEidt>0||tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='温度循环检验原始记录'&&temDataAcquisition)&&PROJECT=='检测中心'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button> <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(dataAcquisitionEidt>0)&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button> <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(dataAcquisitionEidt>0||(tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='温度循环检验原始记录'))&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button> </div> </div> <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('热循环')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('温升试验'))"> @@ -537,7 +537,7 @@ {{ '外端'+(index+1) }} </template> <template slot-scope="scope"> <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" :disabled="state>1" @change="m=>changeItem(scope.row.arr[index])"></el-input> <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" :disabled="state>1||!dataAcquisitionEidtAble" @change="m=>changeItem(scope.row.arr[index])"></el-input> </template> </el-table-column> <el-table-column @@ -549,7 +549,7 @@ {{ '内端'+(index+1) }} </template> <template slot-scope="scope"> <el-input size="small" :disabled="state>1" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input> <el-input size="small" :disabled="state>1||!dataAcquisitionEidtAble" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input> </template> </el-table-column> <el-table-column @@ -2028,7 +2028,21 @@ label:m }) }) this.wareFormChange() this.wareTableDataLoading = true this.$axios.post(this.$api.deviceScope.temDataAcquisition2,{ entrustCode:this.insOrder.entrustCode, sampleCode:this.currentSample.sampleCode, model:this.currentSample.model, }, { headers: { 'Content-Type': 'application/json' }, noQs:true }).then(res=>{ // console.log(res.data) this.wareFormChange() }) // this.wareFormChange() } // 温度循环检验原始记录---结束 // 热循环检验原始记录---开始 @@ -2694,6 +2708,8 @@ getUserInfo() { this.$axios.get(this.$api.user.getUserInfo).then(res => { this.userId = res.data.id this.componentData.entity.userId = res.data.id console.log(1111,this.userId) }) }, // 复核
