From b78307d92ab70853597a785085f8e1d44192ef5f Mon Sep 17 00:00:00 2001 From: 王震 <10952869+daywangzhen@user.noreply.gitee.com> Date: 星期四, 14 九月 2023 11:45:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/view/finishedProductInspectionUp.vue | 649 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 645 insertions(+), 4 deletions(-) diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue index 17bcab3..f40a66f 100644 --- a/src/components/view/finishedProductInspectionUp.vue +++ b/src/components/view/finishedProductInspectionUp.vue @@ -1,13 +1,654 @@ <template> - + <div> + <!-- 鏂板椤甸潰 --> + <div class="addInspection"> + <el-row class="header"> + <el-col :span="12">鏂板浜у搧妫�楠屽崟</el-col> + <el-col :span="12" style="text-align: right;"> + <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false --> + <!-- <el-button type="primary" size="mini" style="background: #004EA2; " + icon="el-icon-circle-plus-outline">鏂板</el-button> --> + <el-button @click="comBack" type="primary" size="mini" icon="el-icon-back" + style="background: #004EA2; ">杩斿洖</el-button> + </el-col> + </el-row> + <el-form :model="processInspectVo" ref="addInspectionform" class="addInspectionform" label-position="right" + label-width="120px" size="small"> + <div class="formwrapper"> + <el-row> + <el-col :span="7"> + <el-form-item label="璁㈠崟鍙凤細"> + <el-input disabled @blur="selectInfoByOrderId" style="width: 180px;" + v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" /> + </el-form-item> + </el-col> + <el-col :span="7"> + <el-form-item label="瀹㈡埛鍚嶇О锛�"> + <el-input disabled style="width: 180px;" v-model="processInspectVo.prname" + placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" /> + </el-form-item> + </el-col> + <el-col :span="7"> + <el-form-item label="宸ョ▼鍚嶇О锛�"> + <el-input disabled style="width: 180px;" v-model="processInspectVo.sname" + placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="7"> + <el-form-item label="浜у搧鍚嶇О锛�"> + <el-select disabled @change="changeOptionsSamplename" style="width: 180px;" 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> + </el-col> + <el-col :span="7"> + <el-form-item label="璐ㄩ噺杩芥函鍙凤細"> + <el-input disabled style="width: 180px;" v-model="processInspectVo.qualityTraceability" + placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" /> + </el-form-item> + </el-col> + <el-col :span="7"> + <el-form-item label="浜у搧缂栫爜锛�"> + <el-input disabled style="width: 180px;" v-model="processInspectVo.mcode" + placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="7"> + <el-form-item label="瑙勬牸鍨嬪彿锛�"> + <el-input disabled style="width: 180px;" v-model="processInspectVo.specificationsModel" + placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" /> + </el-form-item> + </el-col> + <el-col :span="7"> + <el-form-item label="鍗曚綅锛�"> + <el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" + autocomplete="off" /> + </el-form-item> + </el-col> + <el-col :span="7"> + <el-form-item label="鏁伴噺锛�"> + <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�" + autocomplete="off" /> + </el-form-item> + </el-col> + <el-col :span="3" style="display: flex;justify-content: end;"> + <!-- <el-button type="primary" :disabled="isAddProject" @click="addTestProjevt">鐢熸垚妫�楠岄」鐩�</el-button> --> + </el-col> + </el-row> + </div> + </el-form> + </div> + <div class="inspectionProject"> + <el-row> + <el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col> + <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span" style="display: flex;justify-content: end;"> + <el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�楠屽�煎垪</el-button> + <el-button style="margin-right: 30px;" size="mini" + @click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button> + <!-- <el-button + size="mini" + style="margin-right: 30px;" + @click="clickAddLine()" + >娣诲姞妫�楠岃</el-button + > --> + </el-col> + </el-row> + <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)" + style="width: 100%"> + <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 prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="妫�娴嬪��" + min-width="100" style="text-align: center;"> + <template slot-scope="scope"> + <el-tooltip :disabled="scope.row.dname != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" + placement="top-start"> + <el-input :disabled="scope.row.dname === 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"> + <template slot-scope="scope"> + <el-button type="text" @click="clickTableSelect(scope)">{{ + scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname + }}</el-button> + </template> + </el-table-column> + <el-table-column label="缁撹"> + <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> + </template> + </el-table-column> + <!-- <el-table-column v-if="detailId == null" label="鎿嶄綔" width="100"> + <template slot-scope="scope"> + <el-button type="text" @click="clickDeleteline(scope)">鍒犻櫎</el-button> + </template> + </el-table-column> --> + </el-table> + </div> + <div class="inspectionResult"> + <span>妫�娴嬬粨鏋�</span> + <el-table :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="妫�楠岀粨璁�"> + <template slot-scope="scope"> + <span style="color: #34BD66;" v-if="scope.row.conclusion === 1">鍚堟牸</span> + <span style="color: #E84738;" v-else-if="scope.row.conclusion === 0">涓嶅悎鏍�</span> + <span v-else-if="scope.row.conclusion === null || scope.row.conclusion === undefined">鏆傛湭缁撹</span> + </template> + </el-table-column> + <el-table-column prop="operation" label="涓婃姤"> + <template slot-scope="scope"> + <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">涓婃姤</el-button> + <el-button v-else type="success" size="small">宸蹭笂鎶�</el-button> + </template> + </el-table-column> + </el-table> + </div> + <el-dialog title="璇烽�夋嫨璁惧" :visible.sync="centerDialogVisible" width="20%"> + <div class="div_device_dialog"> + <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 6px;"> + </el-input> + <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all + highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree"> + <div class="custom-tree-node" slot-scope="{ data }"> + <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets' + }` + "></i> + {{ data.name }}</span> + </div> + </el-tree> + </div> + <span slot="footer" class="dialog-footer"> + <el-button @click="centerDialogVisible = false">鍙� 娑�</el-button> + <el-button type="primary" @click="clickNodeSure()">纭� 瀹�</el-button> + </span> + </el-dialog> + </div> </template> <script> export default { + props: ['rowInfo'], + data() { + return { + isUpBtn: false, + showUp: false, + isAddProject: false, + showLook: false, + detailId: 0, + rowInfp: {}, + search: { + countSize: 10, + pageSize: 1, + result: "", // 妫�娴嬬姸鎬� + name: "", // 浜у搧鍚嶇О + techfather: "" // 宸ュ簭 + }, + 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: "D-001", + qualityTraceability: null, + quantity: null, + specificationsModel: null, + unit: 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: "", // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁 + clickSelectDevice: { + index: "", // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮� + rpId: "" // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d + } + }; + }, + watch: { + filterText(val) { + this.$refs.tree.filter(val); + } + }, + mounted() { + if(this.rowInfo.result!=null&&this.rowInfo.result!=''){ + this.isUpBtn=true + } + this.processInspectVo.material=this.rowInfo.material + this.processInspectVo.mcode=this.rowInfo.material_code + this.processInspectVo.orderNumber=this.rowInfo.order_number + this.processInspectVo.qualityTraceability=this.rowInfo.quality_traceability + this.processInspectVo.specificationsModel=this.rowInfo.specifications_model + this.processInspectVo.unit=this.rowInfo.unit + this.processInspectVo.quantity=this.rowInfo.quantity + this.processInspectVo.prname=this.rowInfo.customer_name + this.processInspectVo.sname=this.rowInfo.project_name + this.inspectionResultForm[0].id=this.rowInfo.material_code + this.inspectionResultForm[0].name=this.rowInfo.material + this.inspectionResultForm[0].conclusion=this.rowInfo.result + this.detailId=this.rowInfo.id + this.getTableData() + this.getOptions(); + }, + methods: { + escalation() { + let arr = this.inspectionItems + let bl = false + for (let index = 0; index < arr.length; index++) { + const element = arr[index]; + if (element.dname != null && element.empiricalValueAddss[0] != '') { + bl = true + break + } else { + bl = false + } + } + if (bl != true) { + this.$message({ + message: '璇峰厛妫�娴嬩竴椤归」鐩紒', + type: 'warning' + }); + return + } + this.$axios.post(this.$api.url.finishedInspectUpdateFinishInspectsById, { + id: this.detailId + }).then(res => { + if (res.code == 200) { + this.$message({ + message: '涓婃姤鎴愬姛', + type: 'success' + }); + this.$refs.comBackMain(true) + } else { + this.$message({ + message: res.message, + type: 'warning' + }); + } + }) + }, + changeOptionsSamplename(){ + let id=this.processInspectVo.material.split("-")[0] + let sample=this.optionsSamplename.filter(o=>{ + return o.id==id + })[0] + this.processInspectVo.qualityTraceability=sample.qualityTraceability + this.processInspectVo.mcode=sample.mcode + this.processInspectVo.specificationsModel=sample.specifications + 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() { + this.$axios.get(this.$api.url.rawSelectDevice).then(res => { + this.materialOptions = res.data; + }); + }, + // 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂 + clickTableSelect(scope) { + this.centerDialogVisible = true; + this.clickSelectDevice.index = scope.$index; + this.clickSelectDevice.rpId = scope.row.id; + }, + // 鐐瑰嚮鏍戦噷闈㈢殑纭畾 + clickNodeSure() { + 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; + }); + } + }, + changeState(row, index) { + console.log(row); + if (row.did != null && row.did != '') { + let str = "" + row.empiricalValueAddss.forEach(e => { + str += e + "," + }) + 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 + } + } + 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; + } + } + }) + }, + 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.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']) + arr.push(c) + }) + }) + 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) + }) + }, + 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: { + 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 + } else { + this.$message({ + message: '娌℃湁璇ヨ鍗曞彿锛�', + type: 'warning' + }); + } + }) + }, + // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤� + 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.empiricalValueAdd - 1 === 0) { + } else { + if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) { + this.empiricalValueAdd = this.empiricalValueAdd - 1; + this.inspectionItems.forEach(i => { + i.testValueList.splice(this.empiricalValueAdd, 1); + }); + } + } + }, + // 娣诲姞妫�楠屽�煎垪 + clickAddInspectionColumn() { + this.empiricalValueAdd = this.empiricalValueAdd + 1; + } + }, + created() { + this.defaultInitializationTable(); // 鍒濆鍖栬〃鏍兼暟鎹� + } } </script> -<style> - -</style> \ No newline at end of file +<style></style> \ No newline at end of file -- Gitblit v1.9.3