From 941fff624eddc4b9f369f1b91f65fdb50309851d Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期日, 24 九月 2023 16:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/processInspectionUpdate.vue | 956 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 498 insertions(+), 458 deletions(-)
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index e7b2921..eb95ed5 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -24,29 +24,31 @@
<el-form-item label="浜у搧鍚嶇О锛�">
<el-select style="width: 210px;" size="small" disabled @change="selectSample"
v-model="processInspectVo.material" placeholder="璇烽�夋嫨浜у搧">
- <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name" :value="item.name">
+ <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="浜у搧缂栫爜锛�">
- <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.materialCode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
+ <el-input style="width: 210px;" size="small" disabled
+ v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="230">
<el-col :span="7">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.specificationsModel"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ <el-input style="width: 210px;" size="small" disabled
+ v-model="processInspectVo.specificationsModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="宸ュ簭鍚嶇О锛�">
- <el-select @change="changeOptionSoptionSprocesses" disabled v-model="processInspectVo.techfather"
- placeholder="璇烽�夋嫨" style="width: 210px;" size="small">
+ <el-select @change="changeOptionSoptionSprocesses" disabled
+ v-model="processInspectVo.techfather" placeholder="璇烽�夋嫨" style="width: 210px;"
+ size="small">
<el-option v-for="item in optionSoptionSprocesses" :key="item.name" :label="item.name"
:value="item.name">
</el-option>
@@ -55,8 +57,8 @@
</el-col>
<el-col :span="7">
<el-form-item label="宸ヨ壓鍚嶇О锛�">
- <el-select v-model="processInspectVo.techname" disabled placeholder="璇烽�夋嫨" style="width: 210px;"
- size="small">
+ <el-select v-model="processInspectVo.techname" disabled placeholder="璇烽�夋嫨"
+ style="width: 210px;" size="small">
<el-option v-for="item in optionTechnology" :key="item.id" :label="item.name"
:value="item.id + '-' + item.name">
</el-option>
@@ -89,7 +91,8 @@
<el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
<el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span">
<el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
- <el-button style="margin-right: 30px;" size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
+ <el-button style="margin-right: 30px;" size="mini"
+ @click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
<!-- <el-button
size="mini"
style="margin-right: 30px;"
@@ -120,7 +123,7 @@
<template slot-scope="scope">
<el-col>
<el-button type="text" @click="clickTableSelect(scope)">
- {{scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname}}
+ {{ scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname }}
</el-button>
</el-col>
</template>
@@ -129,7 +132,7 @@
<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">{{null}}</span>
+ <span v-show="scope.row.result === null">{{ null }}</span>
</template>
</el-table-column>
<!-- <el-table-column v-if="detailId == null" label="鎿嶄綔" width="100">
@@ -165,10 +168,11 @@
<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">
+ <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>
+ <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>{{
+ data.name }}</span>
</div>
</el-tree>
</div>
@@ -181,142 +185,177 @@
</template>
<script>
- export default {
- props: ['rowInfo'],
- data() {
- return {
- isUpBtn: false,
- showUp: false,
- isAddProject: false,
- detailId: 0,
- row: {},
- search: {
- countSize: 10,
- pageSize: 1,
- result: "", // 妫�娴嬬姸鎬�
- name: "", // 浜у搧鍚嶇О
- techfather: "" // 宸ュ簭
- },
- optionsSamplename: [],
- inspectionTable: [],
- tableColumn: [],
- optionSoptionSprocesses: [],
- optionTechnology: [],
- inspectionTableTotal: "",
- treeProject: [],
- // 娣诲姞鍒�
- empiricalValueAdd: 1,
- // 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
- empiricalValueAddMaxNumber: 0,
- showAddPage: false,
- processInspectVo: {
- material: null,
- materialCode: null,
- orderNumber: "",
- quantity: null,
- specificationsModel: null,
- techfather: null,
- techname: null,
- technologyId: 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: {
- id: 0,
- name: null
- }, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
- clickSelectDevice: {
- index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
- rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
- }
- };
- },
- watch: {
- // filterText(val) {
- // this.$refs.tree.filter(val);
- // }
- },
- created() {
- if (this.rowInfo.result != null && this.rowInfo.result != '') {
- this.isUpBtn = true
- }
- this.processInspectVo.orderNumber = this.rowInfo.order_number
- this.processInspectVo.material = this.rowInfo.material
- this.processInspectVo.materialCode = this.rowInfo.material_code
- this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
- this.processInspectVo.techfather = this.rowInfo.techfather
- this.processInspectVo.techname = this.rowInfo.techname
- this.processInspectVo.unit = this.rowInfo.unit
- this.processInspectVo.quantity = this.rowInfo.quantity
- this.detailId = this.rowInfo.id
- this.inspectionResultForm[0].id = this.rowInfo.material_code
- this.inspectionResultForm[0].name = this.rowInfo.material
- this.inspectionResultForm[0].conclusion = this.rowInfo.result
- // console.log(this.detailId);
- },
- mounted() {
- this.getTableData()
- },
- methods: {
- blurNode(scope) {
- // console.log(11);
- // this.$set(this.inspectionItems[scope.$index],'isSelectDevice',false)
+export default {
+ props: ['rowInfo'],
+ data() {
+ return {
+ isUpBtn: false,
+ showUp: false,
+ isAddProject: false,
+ detailId: 0,
+ row: {},
+ search: {
+ countSize: 10,
+ pageSize: 1,
+ result: "", // 妫�娴嬬姸鎬�
+ name: "", // 浜у搧鍚嶇О
+ techfather: "" // 宸ュ簭
},
- 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
- }
+ optionsSamplename: [],
+ inspectionTable: [],
+ tableColumn: [],
+ optionSoptionSprocesses: [],
+ optionTechnology: [],
+ inspectionTableTotal: "",
+ treeProject: [],
+ // 娣诲姞鍒�
+ empiricalValueAdd: 1,
+ // 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
+ empiricalValueAddMaxNumber: 0,
+ showAddPage: false,
+ processInspectVo: {
+ material: null,
+ materialCode: null,
+ orderNumber: "",
+ quantity: null,
+ specificationsModel: null,
+ techfather: null,
+ techname: null,
+ technologyId: 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: {
+ id: 0,
+ name: null
+ }, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
+ clickSelectDevice: {
+ index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
+ rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
+ }
+ };
+ },
+ watch: {
+ // filterText(val) {
+ // this.$refs.tree.filter(val);
+ // }
+ },
+ created() {
+ if (this.rowInfo.result != null && this.rowInfo.result != '') {
+ this.isUpBtn = true
+ }
+ this.processInspectVo.orderNumber = this.rowInfo.order_number
+ this.processInspectVo.material = this.rowInfo.material
+ this.processInspectVo.materialCode = this.rowInfo.material_code
+ this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
+ this.processInspectVo.techfather = this.rowInfo.techfather
+ this.processInspectVo.techname = this.rowInfo.techname
+ this.processInspectVo.unit = this.rowInfo.unit
+ this.processInspectVo.quantity = this.rowInfo.quantity
+ this.detailId = this.rowInfo.id
+ this.inspectionResultForm[0].id = this.rowInfo.material_code
+ this.inspectionResultForm[0].name = this.rowInfo.material
+ this.inspectionResultForm[0].conclusion = this.rowInfo.result
+ // console.log(this.detailId);
+ },
+ mounted() {
+ this.getTableData()
+ },
+ methods: {
+ blurNode(scope) {
+ // console.log(11);
+ // this.$set(this.inspectionItems[scope.$index],'isSelectDevice',false)
+ },
+ 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) {
+ }
+ if (bl != true) {
+ this.$message({
+ message: '璇峰厛妫�娴嬩竴椤归」鐩紒',
+ type: 'warning'
+ });
+ return
+ }
+ let pro = this.inspectionItems.filter(item => {
+ return item.result === 0;
+ })
+ if (pro.length > 0) {
+ this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputPattern: /^\d+$/,
+ inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+ }).then(({ value }) => {
+ this.$axios.post(this.$api.url.processInspectUpdateProcessInspectsById, {
+ id: this.detailId,
+ number: value
+ }).then(res => {
+ if (res.code == 200) {
+ // this.$message({
+ // message: '涓婃姤鎴愬姛',
+ // type: 'success'
+ // });
+ this.$parent.combackMain(true)
+ } else {
+ this.$message({
+ message: res.message,
+ type: 'warning'
+ });
+ }
+
+ })
+ }).catch(() => {
this.$message({
- message: '璇峰厛妫�娴嬩竴椤归」鐩紒',
- type: 'warning'
+ type: 'info',
+ message: '鍙栨秷杈撳叆'
});
- return
- }
+ });
+ } else {
this.$axios.post(this.$api.url.processInspectUpdateProcessInspectsById, {
id: this.detailId
}).then(res => {
@@ -341,336 +380,337 @@
}
})
- },
- handleClick() {},
- updateInsInfo(row) {
- this.row = row
- this.showUp = true
- },
- // 鐐瑰嚮璁惧鏍戜繚瀛樼偣鍑昏褰�
- 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;
- if (this.materialOptions.length === 1 && row.did != null) {
- this.$message({
- message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
- type: 'warning'
- });
- return
- }
- row.isSelectDevice = true
- });
- },
- //杩斿洖
- combackFather() {
- this.$parent.combackMain()
- },
- // 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
- clickTableSelect(scope) {
- this.centerDialogVisible = true;
- this.clickSelectDevice.index = scope.$index;
- this.clickSelectDevice.rpId = scope.row.id;
- this.getOptions(scope.row);
- },
- // 鐐瑰嚮鏍戦噷闈㈢殑纭畾
- clickNodeSure() {
- if (this.detailId == null) {
- this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
- this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
- this.centerDialogVisible = false;
- } else {
- this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
- id: this.clickSelectDevice.rpId,
- devId: this.nodeData.id,
- type: 1
- }).then(res => {
- this.centerDialogVisible = false;
- this.inspectionItems.forEach(a=>{
- if(a.id == this.clickSelectDevice.rpId){
- a.dname = this.nodeData.name
- }
- })
- });
+ }
+ },
+ handleClick() { },
+ updateInsInfo(row) {
+ this.row = row
+ this.showUp = true
+ },
+ // 鐐瑰嚮璁惧鏍戜繚瀛樼偣鍑昏褰�
+ 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
}
- },
- changeState(row, index) {
- if (row.did != null && row.did != '') {
- let str = ""
- row.empiricalValueAddss.forEach(e => {
- str += e + ","
- })
- if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
- 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 {
+ }).then(res => {
+ this.materialOptions = res.data;
+ if (this.materialOptions.length === 1 && row.did != null) {
this.$message({
- message: '璇烽�夋嫨鎷╄澶囷紒',
+ message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
type: 'warning'
});
+ return
}
- },
- // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
- 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;
+ row.isSelectDevice = true
+ });
+ },
+ //杩斿洖
+ combackFather() {
+ this.$parent.combackMain()
+ },
+ // 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
+ clickTableSelect(scope) {
+ this.centerDialogVisible = true;
+ this.clickSelectDevice.index = scope.$index;
+ this.clickSelectDevice.rpId = scope.row.id;
+ this.getOptions(scope.row);
+ },
+ // 鐐瑰嚮鏍戦噷闈㈢殑纭畾
+ clickNodeSure() {
+ if (this.detailId == null) {
+ this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
+ this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
+ this.centerDialogVisible = false;
+ } else {
+ this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
+ id: this.clickSelectDevice.rpId,
+ devId: this.nodeData.id,
+ type: 1
+ }).then(res => {
+ this.centerDialogVisible = false;
+ this.inspectionItems.forEach(a => {
+ if (a.id == this.clickSelectDevice.rpId) {
+ a.dname = this.nodeData.name
}
- }
+ })
+ });
+ }
+ },
+ changeState(row, index) {
+ if (row.did != null && row.did != '') {
+ let str = ""
+ row.empiricalValueAddss.forEach(e => {
+ str += e + ","
})
- },
- 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.techname = this.processInspectVo.techname.split("-")[1]
- val.technologyId = this.processInspectVo.techname.split("-")[0]
- this.$axios.post(this.$api.url.processInspectAddProcess, {
- material: val.material,
- materialCode: val.materialCode,
- orderNumber: val.orderNumber,
- quantity: val.quantity,
- specificationsModel: val.specificationsModel,
- techfather: val.techfather,
- techname: val.techname,
- technologyId: val.technologyId,
- unit: val.unit
+ if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+ 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 => {
- if (res.code === 201) {
- this.$message({
- message: res.message,
- type: 'warning'
- });
- return
- }
- this.detailId = res.data
- this.inspectionResultForm[0].id = res.data
- this.inspectionResultForm[0].name = val.material
- this.getTableData()
+ row.result = res.data.result
+ row.username = res.data.username
})
- },
- getTableData() {
- this.$axios.get(this.$api.url.processInspectSelectProcessInspectsListById, {
- params: {
- id: this.rowInfo.id
- }
- }).then(res => {
- // console.log(res.data);
- this.processInspectVo.technologyId = res.data[0].techId
- // console.log(this.processInspectVo);
- })
- this.$axios.get(this.$api.url.inspectionItemListUser, {
- params: {
- id: this.detailId,
- type: 1
- }
- }).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)
- })
- })
- 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.chooseMaterProcessInspect, {
- params: {
- orderNumber: this.processInspectVo.orderNumber
- }
- }).then(res => {
- if (res.data.length > 0) {
- console.log(res.data);
- this.optionsSamplename = res.data
+ } 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.$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);
- });
+ this.spanArr.push(1);
+ this.position = index;
}
}
- },
- // 娣诲姞妫�楠屽�煎垪
- clickAddInspectionColumn() {
- this.empiricalValueAdd = this.empiricalValueAdd + 1;
+ })
+ },
+ 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.techname = this.processInspectVo.techname.split("-")[1]
+ val.technologyId = this.processInspectVo.techname.split("-")[0]
+ this.$axios.post(this.$api.url.processInspectAddProcess, {
+ material: val.material,
+ materialCode: val.materialCode,
+ orderNumber: val.orderNumber,
+ quantity: val.quantity,
+ specificationsModel: val.specificationsModel,
+ techfather: val.techfather,
+ techname: val.techname,
+ technologyId: val.technologyId,
+ unit: val.unit
+ }, {
+ 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 = res.data
+ this.inspectionResultForm[0].name = val.material
+ this.getTableData()
+ })
+ },
+ getTableData() {
+ this.$axios.get(this.$api.url.processInspectSelectProcessInspectsListById, {
+ params: {
+ id: this.rowInfo.id
+ }
+ }).then(res => {
+ // console.log(res.data);
+ this.processInspectVo.technologyId = res.data[0].techId
+ // console.log(this.processInspectVo);
+ })
+ this.$axios.get(this.$api.url.inspectionItemListUser, {
+ params: {
+ id: this.detailId,
+ type: 1
+ }
+ }).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)
+ })
+ })
+ 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.chooseMaterProcessInspect, {
+ params: {
+ orderNumber: this.processInspectVo.orderNumber
+ }
+ }).then(res => {
+ if (res.data.length > 0) {
+ console.log(res.data);
+ this.optionsSamplename = res.data
+ } 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;
}
}
+}
</script>
<style></style>
\ No newline at end of file
--
Gitblit v1.9.3