| | |
| | | <div class="page-header"> |
| | | <div class="header-left"> |
| | | <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a> |
| | | <h2>编辑-产品检验</h2> |
| | | <h2>编辑-产品检验单</h2> |
| | | </div> |
| | | <div class="btn-group header-right"> |
| | | <el-button @click="addTestProjevt">生成检验项目</el-button> |
| | | <el-button @click="addTestProject" v-if="processInspectVo.id==null">生成检验项目</el-button> |
| | | </div> |
| | | </div> |
| | | <div class="page-main"> |
| | |
| | | <el-row> |
| | | <el-col :span="6"> |
| | | <el-form-item label="订单号:"> |
| | | <el-input @blur="selectInfoByOrderId" v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" /> |
| | | <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null" |
| | | v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" /> |
| | | </el-form-item> |
| | | </el-col> |
| | | <el-col :span="6"> |
| | |
| | | </el-form-item> |
| | | </el-col> |
| | | <el-col :span="6"> |
| | | <el-form-item label="产品名称:"> |
| | | <el-select style="width: 100%" @change="changeOptionsSamplename" |
| | | v-model="processInspectVo.material" size="small" placeholder="请选择产品名称"> |
| | | <el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name" |
| | | :value="item.id + '-' + item.name"> |
| | | </el-option> |
| | | </el-select> |
| | | <el-form-item label="质量追溯号:"> |
| | | <el-input disabled v-model="processInspectVo.qualityTraceability" |
| | | placeholder="请输入质量追溯号" autocomplete="off" /> |
| | | </el-form-item> |
| | | </el-col> |
| | | </el-row> |
| | | <el-row> |
| | | <el-col :span="6"> |
| | | <el-form-item label="质量追溯号:"> |
| | | <el-input disabled v-model="processInspectVo.qualityTraceability" |
| | | placeholder="请输入追溯号" autocomplete="off" /> |
| | | <el-form-item label="产品名称:"> |
| | | <el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null" |
| | | v-model="processInspectVo.material" size="small" placeholder="请选择产品名称"> |
| | | <el-option v-for="(item,index) in optionsSamplename" :key="index" :label="item.material" |
| | | :value="item.materialCode"> |
| | | </el-option> |
| | | </el-select> |
| | | </el-form-item> |
| | | </el-col> |
| | | <el-col :span="6"> |
| | |
| | | <el-col :span="6"> |
| | | <el-form-item label="规格型号:"> |
| | | <el-input disabled v-model="processInspectVo.specificationsModel" |
| | | placeholder="请输入产品编码" autocomplete="off" /> |
| | | placeholder="请输入规格型号" autocomplete="off" /> |
| | | </el-form-item> |
| | | </el-col> |
| | | <el-col :span="6"> |
| | | <el-form-item label="单位:"> |
| | | <el-input disabled v-model="processInspectVo.unit" |
| | | placeholder="请输入产品编码" autocomplete="off" /> |
| | | placeholder="请输入单位" autocomplete="off" /> |
| | | </el-form-item> |
| | | </el-col> |
| | | </el-row> |
| | |
| | | <el-col :span="6"> |
| | | <el-form-item label="数量:"> |
| | | <el-input v-model="processInspectVo.quantity" placeholder="请输入数量" |
| | | autocomplete="off" /> |
| | | autocomplete="off" :disabled="processInspectVo.id != null" /> |
| | | </el-form-item> |
| | | </el-col> |
| | | </el-row> |
| | |
| | | </el-form> |
| | | </div> |
| | | <div class="finishedProduct-detail"> |
| | | <el-row style="width:100%;z-index: 10;height:50px;"> |
| | | <el-row style="width:100%;z-index: 10;height:30px;"> |
| | | <el-col :span="12" class="inspectionProject_span">检验项目</el-col> |
| | | <el-col :span="12" class="inspectionProject_span" style="text-align: right;"> |
| | | <el-button size="mini" @click="clickAddInspectionColumn()">添加检验值列</el-button> |
| | | <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检验值列</el-button> |
| | | <el-button size="mini" @click="clickAddInspectionColumn()">添加检测值列</el-button> |
| | | <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检测值列</el-button> |
| | | </el-col> |
| | | </el-row> |
| | | <el-row style="width:100%;"> |
| | | <el-col :span="24"> |
| | | <el-table border :data="inspectionItems" max-height="400" :span-method="handleSpanMethod" height="calc(100vh - 550px)" |
| | | style="width: 100%"> |
| | | <el-table border :data="inspectionItems" height="400" |
| | | :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" |
| | | :cell-style="{textAlign:'center'}" row-key="iid" default-expand-all |
| | | style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> |
| | | <el-table-column type="index" label="序号" width="60"></el-table-column> |
| | | <el-table-column label="项目" prop="father"></el-table-column> |
| | | <el-table-column prop="name" label="指标"></el-table-column> |
| | | <el-table-column prop="unit" label="单位"></el-table-column> |
| | | <el-table-column prop="required" label="标准值"></el-table-column> |
| | | <el-table-column prop="internal" label="内测值"></el-table-column> |
| | | <el-table-column label="项目" prop="father" width="240" ></el-table-column> |
| | | <el-table-column prop="iname" label="指标" width="240" ></el-table-column> |
| | | <el-table-column prop="iunit" label="单位" width="240" ></el-table-column> |
| | | <el-table-column prop="required" label="标准值" width="240" ></el-table-column> |
| | | <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值" |
| | | min-width="100" style="text-align: center;"> |
| | | width="240" style="text-align: center;"> |
| | | <template slot-scope="scope"> |
| | | <el-tooltip :disabled="scope.row.dname != null" class="item" effect="dark" content="请先选择设备!" |
| | | <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" |
| | | class="item" effect="dark" content="请先选择设备!" |
| | | placement="top-start"> |
| | | <el-input :disabled="scope.row.dname === null" v-model="scope.row.empiricalValueAddss[index]" |
| | | <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" |
| | | @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input> |
| | | </el-tooltip> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="dname" label="试验设备" min-width="100"> |
| | | <el-table-column prop="deviceName" label="试验设备" min-width="250"> |
| | | <template slot-scope="scope"> |
| | | <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{ |
| | | scope.row.dname == null ? "请选择" : scope.row.dname |
| | | }}</el-button> |
| | | <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="请选择"> |
| | | <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id"> |
| | | </el-option> |
| | | <el-select style="width:100%" v-model="scope.row.eId" |
| | | v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)"> |
| | | <el-option v-for="(item,index) in deviceList" |
| | | :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option> |
| | | </el-select> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column label="结论"> |
| | | <el-table-column label="结论" fixed="right" min-width="100"> |
| | | <template slot-scope="scope"> |
| | | <span style="color: #34BD66;" v-if="scope.row.result === 1">合格</span> |
| | | <span style="color: #E84738;" v-else-if="scope.row.result === 0">不合格</span> |
| | | <span v-show="scope.row.result === null">暂未结论</span> |
| | | <div v-if="scope.row.iname!=null"> |
| | | <span style="color: #34BD66;" v-if="scope.row.iresult == 1">合格</span> |
| | | <span style="color: #E84738;" v-else-if="scope.row.iresult == 0">不合格</span> |
| | | <span v-else>暂无结论</span> |
| | | </div> |
| | | </template> |
| | | </el-table-column> |
| | | </el-table> |
| | | </el-col> |
| | | </el-row> |
| | | </div> |
| | | <div class="finishedProduct-detail"> |
| | | <div class="finishedProduct-result"> |
| | | <el-row style="width:100%"> |
| | | <el-col :span="24">检测结果</el-col> |
| | | </el-row> |
| | | <el-row style="width:100%;margin-top:-180px"> |
| | | <el-row style="width:100%;"> |
| | | <el-col :span="24"> |
| | | <el-table border max-height="400" :data="inspectionResultForm"> |
| | | <el-table-column prop="id" label="物料编号"></el-table-column> |
| | | <el-table-column prop="name" label="物料名称"></el-table-column> |
| | | <el-table-column prop="inspecter" label="检验员"></el-table-column> |
| | | <el-table-column prop="conclusion" label="检验结论"></el-table-column> |
| | | <el-table-column prop="operation" label="上报"></el-table-column> |
| | | <el-table border height="90" :data="inspectionResultForm" |
| | | :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" |
| | | :cell-style="{textAlign:'center'}"> |
| | | <el-table-column prop="materialCode" label="物料编号"></el-table-column> |
| | | <el-table-column prop="material" label="物料名称"></el-table-column> |
| | | <el-table-column prop="userName" label="检验员"></el-table-column> |
| | | <el-table-column prop="result" label="检验结论"> |
| | | <template slot-scope="scope"> |
| | | <el-tag type="success" v-if="scope.row.result == 1">合格</el-tag> |
| | | <el-tag type="danger" v-else-if="scope.row.result == 0">不合格</el-tag> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column label="操作"> |
| | | <template> |
| | | <el-button type="text" @click="submitSave()" size="small">上报</el-button> |
| | | </template> |
| | | </el-table-column> |
| | | </el-table> |
| | | </el-col> |
| | | </el-row> |
| | | </div> |
| | | </div> |
| | | <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%"> |
| | | <div class="div_device_dialog"> |
| | | <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="请选择"> |
| | | <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id"> |
| | | </el-option> |
| | | </el-select> |
| | | </div> |
| | | </el-dialog> |
| | | </div> |
| | | </template> |
| | | |
| | | <script> |
| | | import { |
| | | chooseMater, |
| | | addFinish, |
| | | queryById, |
| | | updateDeviceById, |
| | | updateFinishedInsProduct, |
| | | updateFinishedInspectById, |
| | | } from '@/api/quality/finishedProduct' |
| | | import { selectDevice } from '@/api/quality/rawMaterial' |
| | | export default { |
| | | data() { |
| | | return { |
| | | showUp: false, |
| | | isAddProject: false, |
| | | showLook: false, |
| | | detailId: 0, |
| | | rowInfp: {}, |
| | | search: { |
| | | countSize: 10, |
| | | pageSize: 1, |
| | | result: "", // 检测状态 |
| | | name: "", // 产品名称 |
| | | techfather: "" // 工序 |
| | | }, |
| | | deviceList: [], |
| | | hasChildren: true, |
| | | optionsSamplename: [], |
| | | inspectionTable: [], |
| | | tableColumn: [], |
| | | optionSoptionSprocesses: [], |
| | | optionTechnology: [], |
| | | inspectionTableTotal: 0, |
| | | pageSize: 10, |
| | | currentPage: 1, |
| | | treeProject: [], |
| | | // 添加列 |
| | | empiricalValueAdd: 1, |
| | | // 编辑时存储最长的列数字,做删除判断 |
| | | empiricalValueAddMaxNumber: 0, |
| | | showAddPage: false, |
| | | processInspectVo: { |
| | | id: null, |
| | | material: null, |
| | | mcode: null, |
| | | prname: null, |
| | | sname: null, |
| | | orderNumber: "", |
| | | orderNumber: "ZTTIC20230001", |
| | | qualityTraceability: null, |
| | | quantity: null, |
| | | specificationsModel: null, |
| | | unit: null, |
| | | technologyId: null |
| | | }, |
| | | InspectioniD: null, |
| | | addInspectionform: [ |
| | | { |
| | | number: "", |
| | | username: "", |
| | | projectname: "", |
| | | tracenumber: "", |
| | | code: "", |
| | | class: "", |
| | | specificationmodel: "", |
| | | unit: "", |
| | | quantity: "", |
| | | group: "", |
| | | worker: "", |
| | | machine: "" |
| | | }] |
| | | , |
| | | inspectionItems: [], // 新增检验项目表格 |
| | | inspectionResultForm: [ |
| | | { |
| | | id: "", |
| | | name: "", |
| | | inspecter: "", |
| | | conclusion: "", |
| | | operation: "" |
| | | } |
| | | ], |
| | | options: [], |
| | | value: "", |
| | | rowList: [], |
| | | spanArr: [], |
| | | position: 0, |
| | | // 设备选择树显示 |
| | | centerDialogVisible: false, |
| | | filterText: "", |
| | | materialOptions: [], |
| | | defaultProps: { |
| | | // 设备树数据设置 |
| | | children: "children", |
| | | label: "name" |
| | | }, |
| | | nodeData: { |
| | | id: 0, |
| | | name: null |
| | | }, // node点击保存当前点击数据 |
| | | clickSelectDevice: { |
| | | index: null, // 点击选择存储当前行索引 |
| | | rpId: null // 点击选择存储当前行项目Id |
| | | } |
| | | }; |
| | | inspectionResultForm: [], |
| | | } |
| | | }, |
| | | watch: { |
| | | // filterText(val) { |
| | | // this.$refs.tree.filter(val); |
| | | // } |
| | | }, |
| | | beforeUpdate(){ |
| | | this.$nextTick(()=>{ |
| | | this.$refs.table.doLayout(); |
| | | }) |
| | | }, |
| | | created() { |
| | | }, |
| | | mounted() { |
| | | this.getTableData() |
| | | // this.getOptions(); |
| | | this.getDeviceList() |
| | | this.processInspectVo.id = this.$route.query.id |
| | | this.init() |
| | | }, |
| | | methods: { |
| | | changeOptionsSamplename() { |
| | | let id = this.processInspectVo.material.split("-")[0] |
| | | submitSave(){ |
| | | let pro = 0 |
| | | this.inspectionItems.forEach(item => { |
| | | if(item.children){ |
| | | let arr = item.children.filter(obj=>{ |
| | | return obj.iresult == 0; |
| | | }) |
| | | console.log("aaa--",arr,arr.length) |
| | | pro+=arr.length |
| | | } |
| | | }) |
| | | if (pro > 0) { |
| | | this.$prompt('请输入不合格数量', '不合格数量', { |
| | | confirmButtonText: '确定', |
| | | cancelButtonText: '取消', |
| | | inputPattern: /^\d+$/, |
| | | inputErrorMessage: '请输入正确数字格式' |
| | | }).then(({ value }) => { |
| | | let data = { |
| | | id: this.processInspectVo.id, |
| | | number: value |
| | | } |
| | | updateFinishedInspectById(data).then(res => { |
| | | this.$message.success("上报成功"); |
| | | }); |
| | | }).catch(() => {}); |
| | | }else{ |
| | | updateFinishedInspectById({id:this.processInspectVo.id,number:0}).then(res => { |
| | | this.$message.success("上报成功"); |
| | | }); |
| | | } |
| | | this.init() |
| | | }, |
| | | init(){ |
| | | let id = this.processInspectVo.id |
| | | if(id != null){ |
| | | queryById(id).then(res=>{ |
| | | let result = res.data.data |
| | | this.processInspectVo.orderNumber = result.orderNumber |
| | | this.processInspectVo.mcode = result.materialCode |
| | | this.processInspectVo.prname = result.customerName |
| | | this.processInspectVo.sname = result.projectName |
| | | this.processInspectVo.material = result.material |
| | | this.processInspectVo.specificationsModel = result.specs |
| | | this.processInspectVo.unit = result.punit |
| | | this.processInspectVo.quantity = result.quantity |
| | | let resultVal = 1 |
| | | let userList = [] |
| | | result.children.forEach(item=>{ |
| | | item.iid = Math.random() |
| | | if(item.children != undefined){ |
| | | item.children.forEach(obj=>{ |
| | | let arr = [] |
| | | if(obj.userName){ |
| | | userList.push(obj.userName) |
| | | } |
| | | if(obj.inspectionValue){ |
| | | arr = obj.inspectionValue.split(",") |
| | | } |
| | | if(obj.iresult && obj.iresult == 0){ |
| | | resultVal = 0 |
| | | } |
| | | obj.empiricalValueAddss = arr |
| | | if(arr.length > this.empiricalValueAdd){ |
| | | this.empiricalValueAdd = arr.length |
| | | } |
| | | }) |
| | | } |
| | | }) |
| | | this.inspectionItems = result.children |
| | | this.inspectionResultForm = [{ |
| | | materialCode: result.materialCode, |
| | | material: result.material, |
| | | userName: Array.from(new Set(userList)).join(","), |
| | | result: resultVal, |
| | | }] |
| | | }).catch(error=>{ |
| | | console.log(error) |
| | | }) |
| | | } |
| | | }, |
| | | getDeviceList(){ |
| | | selectDevice(null).then(res=>{ |
| | | this.deviceList = res.data.data |
| | | }) |
| | | }, |
| | | updateDevice(row){ |
| | | updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{ |
| | | }).catch(error=>{ |
| | | console.log(error) |
| | | }) |
| | | }, |
| | | changeOptionsSamplename(val) { |
| | | let sample = this.optionsSamplename.filter(o => { |
| | | return o.id == id |
| | | return o.materialCode == val |
| | | })[0] |
| | | this.processInspectVo.qualityTraceability = sample.qualityTraceability |
| | | this.processInspectVo.mcode = sample.mcode |
| | | this.processInspectVo.specificationsModel = sample.specifications |
| | | // this.processInspectVo.qualityTraceability = sample.qualityTraceability |
| | | this.processInspectVo.mcode = sample.materialCode |
| | | this.processInspectVo.material = sample.material |
| | | this.processInspectVo.specificationsModel = sample.specs |
| | | this.processInspectVo.unit = sample.unit |
| | | }, |
| | | comBack() { |
| | | this.$parent.comBackMain() |
| | | }, |
| | | handleClick(row) { |
| | | this.rowInfp = row |
| | | this.showLook = true |
| | | }, |
| | | updateInsInfo(row) { |
| | | this.rowInfp = row |
| | | this.showUp = true |
| | | }, |
| | | combackMain() { |
| | | this.showUp = false |
| | | this.showLook = false |
| | | }, |
| | | searchPro() { |
| | | this.search.countSize = this.pageSize |
| | | this.search.pageSize = this.currentPage |
| | | this.defaultInitializationTable() |
| | | }, |
| | | // 点击设备树保存点击记录 |
| | | nodeClick(data) { |
| | | if (data.id != undefined) this.nodeData = data; |
| | | }, |
| | | // 设备树过滤搜索 |
| | | filterNode(value, data) { |
| | | if (!value) return true; |
| | | return data.name.indexOf(value) !== -1; |
| | | }, |
| | | // 获取设备树内容 |
| | | getOptions(row) { |
| | | this.$axios.get(this.$api.url.inspectionItemChooseDev, { |
| | | params: { |
| | | father: row.father, |
| | | name: row.name, |
| | | technologyId: this.processInspectVo.technologyId |
| | | } |
| | | }).then(res => { |
| | | this.materialOptions = res.data; |
| | | this.filterText = row.did |
| | | if(this.materialOptions.length===1){ |
| | | this.$message({ |
| | | message: '该项目下只有一个试验设备,无需选择!', |
| | | type: 'warning' |
| | | }); |
| | | return |
| | | } |
| | | row.isSelectDevice = true |
| | | }); |
| | | }, |
| | | // 点击表格选择触发 |
| | | clickTableSelect(scope) { |
| | | if(this.clickSelectDevice.index!=null){ |
| | | this.$set(this.inspectionItems[this.clickSelectDevice.index],'isSelectDevice',false) |
| | | } |
| | | this.clickSelectDevice.index = scope.$index; |
| | | this.clickSelectDevice.rpId = scope.row.id; |
| | | this.getOptions(scope.row); |
| | | }, |
| | | // 点击树里面的确定 |
| | | clickNodeSure(row) { |
| | | let select = this.materialOptions.filter(item => { |
| | | return item.id === this.filterText |
| | | })[0] |
| | | this.nodeData.id = select.id |
| | | this.nodeData.name = select.device |
| | | if (this.detailId == null) { |
| | | this.inspectionItems[ |
| | | this.clickSelectDevice.index |
| | | ].did = this.nodeData.id; |
| | | this.inspectionItems[ |
| | | this.clickSelectDevice.index |
| | | ].dname = this.nodeData.name; |
| | | this.centerDialogVisible = false; |
| | | } else { |
| | | this.$axios |
| | | .post(this.$api.url.inspectionItemUpdateDevByInsId, { |
| | | id: this.clickSelectDevice.rpId, |
| | | type: 2, |
| | | devId: this.nodeData.id |
| | | }) |
| | | .then(res => { |
| | | this.getTableData() |
| | | this.centerDialogVisible = false; |
| | | row.isSelectDevice=false |
| | | }); |
| | | } |
| | | }, |
| | | changeState(row, index) { |
| | | if (row.did != null && row.did != '') { |
| | | // let val = row.empiricalValueAddss.filter(item => { |
| | | // return item != '' && item != null |
| | | // }) |
| | | // let eq = val.filter(item => { |
| | | // return /^[^><=]/.test(item) |
| | | // }) |
| | | // if (eq.length > 0) { |
| | | // this.$message({ |
| | | // message: "检测值[" + eq + "]格式首位应包含>,<或者=", |
| | | // type: 'warning' |
| | | // }); |
| | | // return |
| | | // } |
| | | if (row.iid != null && row.iid != '') { |
| | | let str = "" |
| | | row.empiricalValueAddss.forEach(e => { |
| | | str += e + "," |
| | | }) |
| | | if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) { |
| | | str = str.slice(0,-1); |
| | | if (str === undefined || str === '' || str === null ) { |
| | | return |
| | | } |
| | | this.$axios.post(this.$api.url.inspectionItemlose_focus_update, { |
| | | deviceId: row.did, |
| | | inspectionItemId: row.id, |
| | | inspectionValue: str.slice(0, -1) |
| | | }, { |
| | | headers: { "Content-Type": "application/json" } |
| | | }).then(res => { |
| | | row.result = res.data.result |
| | | row.username = res.data.username |
| | | }) |
| | | } else { |
| | | this.$message({ |
| | | message: '请选择择设备!', |
| | | type: 'warning' |
| | | }); |
| | | } |
| | | }, |
| | | // 每页条数改变时触发 选择一页显示多少行 |
| | | handleSizeChange(val) { |
| | | this.search.countSize = val; |
| | | this.defaultInitializationTable(); |
| | | }, |
| | | handleSpanMethod({ row, column, rowIndex, columnIndex }) { |
| | | if (columnIndex === 0) { |
| | | const _row = this.spanArr[rowIndex]; |
| | | const _col = _row > 0 ? 1 : 0; |
| | | return { |
| | | rowspan: _row, |
| | | colspan: _col |
| | | let obj = { |
| | | equiomentId: row.eId, |
| | | fpid: row.iid, |
| | | inspectionValue: str |
| | | } |
| | | } |
| | | if (columnIndex === 1) { |
| | | const _row = this.spanArr[rowIndex]; |
| | | const _col = _row > 0 ? 1 : 0; |
| | | return { |
| | | rowspan: _row, |
| | | colspan: _col |
| | | } |
| | | } |
| | | }, |
| | | // 合并表格 |
| | | mergeTable() { |
| | | this.rowList = [] |
| | | this.spanArr = [] |
| | | this.position = 0 |
| | | this.inspectionItems.forEach((item, index) => { |
| | | if (index === 0) { |
| | | this.spanArr.push(1); |
| | | this.position = 0; |
| | | } else { |
| | | if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) { |
| | | this.spanArr[this.position] += 1; |
| | | this.spanArr.push(0); |
| | | } else { |
| | | this.spanArr.push(1); |
| | | this.position = index; |
| | | updateFinishedInsProduct(obj).then(res=>{ |
| | | if(res.data.code == 0){ |
| | | this.$message.success("更新成功") |
| | | }else{ |
| | | this.$message.error("更新失败") |
| | | } |
| | | } |
| | | }) |
| | | this.init() |
| | | }) |
| | | } |
| | | }, |
| | | changeOptionSoptionSprocesses() { |
| | | this.optionTechnology = [] |
| | | let working = this.optionSoptionSprocesses.filter(item => { |
| | | return item.name === this.processInspectVo.techfather |
| | | })[0] |
| | | this.optionTechnology = working.children |
| | | }, |
| | | addTestProjevt() { |
| | | // this.isAddProject = true |
| | | let val = JSON.parse(JSON.stringify(this.processInspectVo)) |
| | | val.material = this.processInspectVo.material.split("-")[1] |
| | | val.id = this.processInspectVo.material.split("-")[0] |
| | | this.$axios.post(this.$api.url.finishedInspectAddFinish, val, { |
| | | headers: { "Content-Type": "application/json" } |
| | | }).then(res => { |
| | | if (res.code == 201) { |
| | | this.$message({ |
| | | message: res.message, |
| | | type: 'warning' |
| | | }); |
| | | return |
| | | } |
| | | this.detailId = res.data |
| | | this.inspectionResultForm[0].id = val.mcode |
| | | this.inspectionResultForm[0].name = val.material |
| | | this.getTableData() |
| | | }) |
| | | }, |
| | | getTableData() { |
| | | this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, { |
| | | params: { |
| | | id: this.detailId |
| | | } |
| | | }).then(res => { |
| | | this.processInspectVo.technologyId = res.data[0].techId |
| | | }) |
| | | this.$axios.get(this.$api.url.inspectionItemListUser, { |
| | | params: { |
| | | id: this.detailId, |
| | | type: 2 |
| | | } |
| | | }).then(res => { |
| | | if (res.data.length < 1) { |
| | | return |
| | | } |
| | | this.inspectionItems = res.data |
| | | let arr = [] |
| | | let val = JSON.parse(JSON.stringify(this.inspectionItems)) |
| | | const uName = [] |
| | | //转成一维数组 |
| | | val.forEach(l => { |
| | | let father = l.father |
| | | l.children.forEach(c => { |
| | | c.father = father |
| | | c.empiricalValueAddss = [] |
| | | if (c.inspectionValue != '' && c.inspectionValue != null) { |
| | | c.empiricalValueAddss = c.inspectionValue.split(","); |
| | | } else { |
| | | c.empiricalValueAddss.push("") |
| | | } |
| | | uName.push(c['username']) |
| | | c.isSelectDevice = false |
| | | arr.push(c) |
| | | addTestProject() { |
| | | let val = this.processInspectVo |
| | | let data = { |
| | | customerName: val.prname, |
| | | material: val.material, |
| | | materialCode: val.mcode, |
| | | orderNumber: val.orderNumber, |
| | | projectName: val.sname, |
| | | quantity: val.quantity, |
| | | specs: val.specificationsModel, |
| | | unit: val.unit, |
| | | } |
| | | addFinish(data).then(res=>{ |
| | | let id = res.data.data |
| | | if(id != null){ |
| | | queryById(id).then(response=>{ |
| | | console.log(response.data.data.children) |
| | | let proList = response.data.data.children |
| | | proList.forEach(item=>{ |
| | | item.iid = Math.random(); |
| | | if(item.children != undefined){ |
| | | item.children.forEach(obj=>{ |
| | | obj.empiricalValueAddss = [] |
| | | }) |
| | | } |
| | | }) |
| | | this.inspectionItems = proList |
| | | }).catch(error=>{ |
| | | console.log(error); |
| | | }) |
| | | }) |
| | | this.inspectionItems = arr |
| | | let arrSort = JSON.parse(JSON.stringify(arr)) |
| | | //根据集合对象数组长度排序 |
| | | arrSort.sort((a, b) => { |
| | | if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) { |
| | | return -1; // a排在b前面 |
| | | } else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) { |
| | | return 1; // a排在b后面 |
| | | } else { |
| | | return 0; // 保持相对顺序不变 |
| | | } |
| | | }); |
| | | // console.log(arrSort); |
| | | console.log(uName); |
| | | let name = [...new Set(uName)].filter(item => item !== null); |
| | | let rname = '' |
| | | name.forEach(m => { |
| | | rname += m + "," |
| | | }) |
| | | this.inspectionResultForm[0].inspecter = rname.slice(0, -1) |
| | | this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length |
| | | this.mergeTable(arr) |
| | | } |
| | | }).catch(error=>{ |
| | | console.log(error) |
| | | }) |
| | | }, |
| | | selectSample() { |
| | | let sample = this.optionsSamplename.filter(item => { |
| | | return item.name === this.processInspectVo.material |
| | | })[0] |
| | | this.processInspectVo.techfather = null |
| | | this.processInspectVo.techname = null |
| | | this.processInspectVo.materialCode = sample.code |
| | | this.processInspectVo.specificationsModel = sample.specifications |
| | | this.processInspectVo.unit = sample.unit |
| | | this.optionSoptionSprocesses = [] |
| | | this.optionSoptionSprocesses = sample.children |
| | | }, |
| | | selectInfoByOrderId() { |
| | | this.$axios.get(this.$api.url.finishedInspectChooseMater, { |
| | | params: { |
| | | chooseMater({ |
| | | orderNumber: this.processInspectVo.orderNumber |
| | | } |
| | | }).then(res => { |
| | | if (res.data.length > 0) { |
| | | console.log(res.data); |
| | | this.processInspectVo.sname = res.data[0].sname |
| | | this.processInspectVo.prname = res.data[0].prname |
| | | this.optionsSamplename = res.data[0].children |
| | | }).then(res => { |
| | | if (res.data.data != null) { |
| | | this.processInspectVo.sname = res.data.data.projectName |
| | | this.processInspectVo.prname = res.data.data.customerName |
| | | this.optionsSamplename = res.data.data.children |
| | | } else { |
| | | this.$message({ |
| | | message: '没有该订单号!', |
| | | type: 'warning' |
| | | }); |
| | | this.processInspectVo.sname = null |
| | | this.processInspectVo.prname = null |
| | | this.optionsSamplename = [] |
| | | this.processInspectVo.mcode = null |
| | | this.processInspectVo.material = null |
| | | this.processInspectVo.specificationsModel = null |
| | | this.processInspectVo.unit = null |
| | | } |
| | | }) |
| | | }, |
| | | // 当前页改变时触发 跳转其他页 |
| | | handleCurrentChange(val) { |
| | | this.search.pageSize = val; |
| | | this.defaultInitializationTable(); |
| | | }, |
| | | // 显示新增页面 |
| | | handleAddNew() { |
| | | this.showAddPage = true; |
| | | // this.getTableData() |
| | | }, |
| | | // 表格初始化接口 |
| | | defaultInitializationTable() { |
| | | this.$axios |
| | | .post(this.$api.url.selectProcessInspectsList, this.search) |
| | | .then(res => { |
| | | this.inspectionTableTotal = res.data.total; |
| | | this.inspectionTable = res.data.row; |
| | | }); |
| | | }, |
| | | // 添加行 |
| | | clickAddLine() { |
| | | let obj = { |
| | | material: "", |
| | | materialCode: "", |
| | | orderNumber: "", |
| | | quantity: 0, |
| | | specificationsModel: "", |
| | | techfather: "", |
| | | techname: "", |
| | | technologyId: 0, |
| | | unit: "" |
| | | }; |
| | | this.inspectionItems.push(obj); |
| | | }, |
| | | // 删除行 |
| | | clickDeleteline(scope) { |
| | | this.inspectionItems.splice(scope.$index, 1); |
| | | }, |
| | | // 删除检验值列 |
| | | clickDeleteInspectionColumn() { |
| | |
| | | if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) { |
| | | this.empiricalValueAdd = this.empiricalValueAdd - 1; |
| | | this.inspectionItems.forEach(i => { |
| | | i.testValueList.splice(this.empiricalValueAdd, 1); |
| | | i.empiricalValueAddss.splice(this.empiricalValueAdd, 1); |
| | | }); |
| | | } |
| | | } |
| | |
| | | this.empiricalValueAdd = this.empiricalValueAdd + 1; |
| | | } |
| | | }, |
| | | created() { |
| | | this.defaultInitializationTable(); // 初始化表格数据 |
| | | } |
| | | } |
| | | </script> |
| | | |
| | | <style scoped> |
| | | .finishedProduct-detail { |
| | | width: 100%; |
| | | height: 460px; |
| | | height: 470px; |
| | | padding: 10px 20px; |
| | | display: flex; |
| | | border: 1px solid #ddd; |
| | | background-color: #fff; |
| | | margin-top: 10px; |
| | | box-sizing: border-box; |
| | | flex-wrap: wrap; |
| | | } |
| | | |
| | | .finishedProduct-result { |
| | | width: 100%; |
| | | height: 150px; |
| | | padding: 10px 20px; |
| | | display: flex; |
| | | border: 1px solid #ddd; |
| | |
| | | |
| | | .finishedProduct-basic { |
| | | background-color: #fff; |
| | | height: 150px; |
| | | height: 155px; |
| | | display: flex; |
| | | flex-wrap: wrap; |
| | | padding: 10px 20px; |