From 88859106604b03bed968f2f55508e3a5b83f4ce9 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 19 九月 2023 10:21:38 +0800
Subject: [PATCH] modified: src/components/view/Processingproducts.vue modified: src/components/view/Technicalindex.vue modified: src/components/view/finishedProductInspectionUp.vue modified: src/components/view/processInspectionUpdate.vue modified: src/components/view/raw-ins.vue modified: src/components/view/rawUnqualified/raw.vue modified: src/components/view/record-content.vue modified: src/components/view/self-inspection.vue modified: src/components/view/technical.vue modified: src/main.js
---
src/components/view/Technicalindex.vue | 101 +++++++++++++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 43 deletions(-)
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 788d84a..905643d 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -95,6 +95,7 @@
<div class="right">
<el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%"
max-height="100%" row-key="name" border
+ @select-all="selectAll"
@select="selectTr"
ref="multipleTable"
@selection-change="handleSelectionChange"
@@ -199,7 +200,7 @@
<el-form-item label="绫诲瀷">
<template>
<el-select v-model="form.type" size="small" placeholder="璇烽�夋嫨" @change="edittype"
- style="width: 554px;margin-right: 30px;">
+ style="width: 98%;margin-right: 30px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -222,7 +223,7 @@
<el-col :span="11" :offset="2">
<el-form-item label="宸ヨ壓">
<template>
- <el-select v-model="form.name" placeholder="璇烽�夋嫨" allow-create filterable>
+ <el-select v-model="form.name" style="width: 95%;" placeholder="璇烽�夋嫨" @change="craftrow" allow-create filterable>
<el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -261,13 +262,13 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="椤圭洰">
- <el-input v-model="form.project" style="width: 200px;" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
+ <el-input v-model="form.project" style="width: 95%;" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="鍗曚綅">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 200px;"></el-input>
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 35.95%;"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -309,6 +310,7 @@
modifyevent:false,
dialogVisible:false,
tableData: [],
+ crafval:'',
typeselect:0,
upData:{},
upDia:false,
@@ -331,26 +333,43 @@
this.selectAllright()
},
methods:{
- // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
- // 鍏ㄩ��/鍙栨秷閫夋搷浣�
- selectAll(val) {
- this.isAllSelect = !this.isAllSelect;
- let data = this.tableData;
- this.toggleSelect(data, this.isAllSelect, "all");
- },
+ handleSelectionChange(val) {
+ this.selects = val;
+ this.deleteList = [];
+ val.forEach((v) => {
+ if (v.id !== undefined) {
+ this.deleteList.push(v.id);
+ }
+ });
+ },
+ // 鍏ㄩ��/鍙栨秷閫夋搷浣�
+ selectAll(val) {
+ this.isAllSelect = !this.isAllSelect;
+ let data = this.tableData;
+ this.toggleSelect(data, this.isAllSelect, "all");
+ },
//閫夋嫨鏌愯
selectTr(selection, row) {
- console.log(selection,row);
this.$set(row, "isChecked", !row.isChecked);
this.$nextTick(() => {
this.isAllSelect = row.isChecked;
this.toggleSelect(row, row.isChecked, "tr");
});
},
+ toggleSelection(row, flag) {
+ this.$set(row, "isChecked", flag);
+ this.$nextTick(() => {
+ if (flag) {
+ this.$refs.multipleTable.toggleRowSelection(row, flag);
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ });
+ },
//閫掑綊瀛愮骇
toggleSelect(data, flag, type) {
+ // console.log('222');
if (type === "all") {
- console.log('222');
if (data.length > 0) {
data.forEach((item) => {
this.toggleSelection(item, flag);
@@ -369,9 +388,8 @@
}
}
},
- handleClose(){
-
- },
+//---------------------------------------------------------------------------------------------------------------------------------------
+ handleClose(){},
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -416,7 +434,8 @@
"Content-Type": "application/json"
}
}).then(res => {
- this.selectAllright()
+ /* this.selectAllright() */
+ this.$parent.removeAllTab()
})
},
submitUpData() { //纭畾
@@ -429,8 +448,9 @@
this.$axios.post(this.$api.url.delTechBy, {
id: this.upData.id
}).then(res => {
- this.selectAllright()
+ /* this.selectAllright() */
this.$message.success('鍒犻櫎瀹屾垚')
+ this.$parent.removeAllTab()
})
},
deleteRow(index, rows) {
@@ -444,23 +464,23 @@
this.$axios.post(this.$api.url.delAllTechskill, {
ids: this.delete
}).then(res => {
- this.selectAllright()
+ /* this.selectAllright() */
+ this.$parent.removeAllTab()
})
},
dels() {
- this.selects.forEach(a => {
- for (var b = 0; b < this.tableData.length; b++) {
- if (this.tableData[b].id == a.id) {
- this.tableData.splice(b, 1)
- b--
- }
- }
- })
- let cc = this.selects.map(el => {
- return el.id
- })
- cc.splice(0,1)
- this.delete = cc.join(',')
+
+ let ee = []
+ console.log(this.selects);
+ this.selects.forEach(el =>{
+ if(el.children){
+ el.children.forEach(ele =>{
+ ee.push(ele.id)
+ })
+ }
+ })
+ // cc.splice(0,1)
+ this.delete = ee.join(',')
console.log(this.delete);
this.delAllTechskill()
this.$message.success('鍒犻櫎瀹屾垚')
@@ -519,6 +539,7 @@
})[0]
console.log(one);
let name = one.children[0].id
+ this.checkTreeNode.id = name
console.log(name);
this.selectAllrightStart(name)
this.selectDataList();
@@ -550,12 +571,16 @@
console.log(this.tableData);
});
},
+ craftrow(val){
+ this.crafval = val
+ this.chooseProFath()
+ },
//涓婄骇
chooseProFath() {
console.log(this.checkTreeNode.id);
this.$axios.get(this.$api.url.chooseProFath, {
params: {
- techTemId: this.checkTreeNode.id
+ techTemId:this.crafval
}
}).then(res => {
this.higherlevel = res.data;
@@ -599,16 +624,6 @@
},
modify() {
this.modifyevent = true
- },
-
- handleSelectionChange(val) {
- this.selects = val;
- this.deleteList = [];
- val.forEach((v) => {
- if (v.id !== undefined) {
- this.deleteList.push(v.id);
- }
- });
},
//缂栬緫
--
Gitblit v1.9.3