| src/components/do/b1-ins-order/add.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-inspect-order-plan/Inspection.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/b1-inspection-order.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/do/b1-ins-order/add.vue
@@ -154,10 +154,10 @@ <el-button size="medium" type="primary" @click="openConfig" v-if="addObj.sampleType==='光缆'">光纤配置</el-button> <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">提交</el-button> <!-- 审核 --> <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3" <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3&&addObj.companyId" :disabled="saveLoad">不通过</el-button> <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad" v-show="active==3">通过</el-button> v-show="active==3&&addObj.companyId">通过</el-button> <el-button size="medium" @click="$parent.playOrder(0)"> <span style="color: #3A7BFA;">返回</span> </el-button> @@ -367,7 +367,7 @@ </div> </div> </div> <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark" <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" max-height="400px" tooltip-effect="dark" border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;"> <el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column> <el-table-column type="index" label="序号" width="65" align="center"></el-table-column> @@ -428,7 +428,7 @@ </el-table-column> <el-table-column prop="proNum" label="待检项数量" width="105" align="center"></el-table-column> </el-table> <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border <el-table class="el-table" ref="productTable" :data="productList" max-height="400px" tooltip-effect="dark" border @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect" :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll"> <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column> @@ -563,7 +563,8 @@ <el-button type="primary" @click="addTemplateDia" :loading="templateLoading">确 定</el-button> </span> </el-dialog> <el-dialog title="检验下发" :visible.sync="issuedDialogVisible" width="400px"> <el-dialog title="检验下发" :visible.sync="issuedDialogVisible" width="400px" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> <div class="body" style="max-height: 60vh;"> <el-row> <el-col class="search_thing" :span="22"> @@ -596,7 +597,7 @@ </div> <span slot="footer" class="dialog-footer"> <el-row> <el-button @click="issuedDialogVisible=false">取 消</el-button> <el-button @click="issuedDialogVisible=false;$parent.playOrder(0)">取 消</el-button> <el-button type="primary" @click="submitForm2" :loading="upLoad">确 定</el-button> </el-row> </span> @@ -1572,7 +1573,7 @@ isHaveBushing = false } }) console.log('isHaveBushing===', this.totalArr) // console.log('isHaveBushing===', this.totalArr) // inspectionItem let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('松套管')) // console.log('isHaveBushing===', isHaveBushing) @@ -2168,6 +2169,7 @@ row.bsm1 = false }else if(arr.length>0){ try{ row.bsmRow = this.HaveJson(row) let section = arr[0].section let arr0 = JSON.parse(row.section) let arr1 = JSON.parse(row.ask) @@ -2485,6 +2487,7 @@ } }, handleAll(e) { console.log(1111,this.bsm1DiaAll,this.bsm1Dia) // console.log('e---', e) if (e.length > 0) { this.productList.map(m => { @@ -2633,6 +2636,7 @@ this.$message.error('未选中样品') return } this.sampleIds = [this.sampleId] this.$axios.post(this.$api.insBushing.selectBushingBySampleId, { sampleId: this.sampleId }).then(res => { src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -295,6 +295,17 @@ </el-radio-group> </div> <div style="display: flex;align-items: center;"> <span v-if="casing.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'"> 套管：</span> <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,3)" v-if="casing.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='成品缆检验原始记录'" size="small"> <el-option v-for="item in casing" :key="item.id" :label="item.color" :value="item.id"> <span style="float: left">{{ item.color}}</span> <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'已检':'未检' }}</el-tag> </el-option> </el-select> <span v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'"> 光纤带：</span> <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,1)" v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'" size="small"> <el-option @@ -751,6 +762,7 @@ size="medium" style="margin-right: 5px;">{{item.label}}</el-tag> </template> </el-table-column> <el-table-column prop="checkName" label="检验人" min-width="80px" show-overflow-tooltip></el-table-column> <el-table-column prop="isLeave" label="是否留样" width="95px" show-overflow-tooltip align="center"> <template slot-scope="scope"> <span>{{ scope.row.isLeave==0?'否':'是' }}</span> @@ -971,6 +983,7 @@ temptList:null, fiber:[], fibers:[], casing:[], currentTab:null, wareForm:{ inspectionItem:1, @@ -1166,11 +1179,13 @@ this.tableList = this.tableLists.filter(m => m.templateId == val1) this.handleTableData() } // this.$delete(this.tableList,0) // this.$set(this.tableList, 0, m) // this.handleTableData() } }) if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='成品缆检验原始记录')){ if(this.casing.length>0){ this.handleChange(this.casing[0].id,3) } } } }, equipForm:{ @@ -1276,6 +1291,32 @@ value:data[i][j].result, frequency:data[i].frequency } let list = this.tableList[0].arr list.forEach((item,index)=>{ let num0 = 0; let str = '' let str0 = i+','+j item.forEach(m=>{ if(m.v.ps&&(m.v.ps.value=='检验子项'||m.v.ps.value=='检验项')){ if(m.v.ps&&m.v.ps.value=='检验项'){ if(num0==0){ str = m.v.v+',' num0++ } } if(m.v.ps&&m.v.ps.value=='检验子项'){ if(num0==1){ str = str+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) } } }) }) }else if(j!='frequency'&&data[i][j]&&Array.isArray(data[i][j].result)){ let str0 = i+','+j let list = this.tableList[0].arr @@ -1306,6 +1347,7 @@ 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) @@ -2036,6 +2078,8 @@ this.$axios.post(this.$api.insOrderPlan.getReportModel+'?sampleId='+id, {}).then(res => { this.fibers = res.data['光纤带'] this.fiber = res.data['光纤'] this.casing = res.data['套管'] console.log(this.casing) }) }, async handleChange(m,type){ src/components/view/b1-inspection-order.vue
@@ -182,7 +182,7 @@ <div class="search_thing" style="width: 20%;"> <div class="search_label">样品名称：</div> <div class="search_input"><el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div> v-model="componentData.entity.sampleName" @keyup.enter.native="refreshTable()"></el-input></div> </div> <div class="search_thing" style="width: 20%;"> <div class="search_label">样品型号：</div>
