From 22b45a79b2ceab7625e0fe248458c398cc26110d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 25 九月 2023 12:53:59 +0800
Subject: [PATCH] modified: src/components/view/Processingproducts.vue modified: src/components/view/rawInsDetail.vue modified: src/components/view/sale.vue
---
src/components/view/equipmentmaintain.vue | 92 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 18aefff..b9fcd0a 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -22,10 +22,7 @@
<el-form-item label="绫诲瀷">
<template>
<el-select v-model="edit.type" disabled placeholder="璇烽�夋嫨" style="width: 560px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
</template>
</el-form-item>
@@ -114,11 +111,8 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="form.type" placeholder="璇烽�夋嫨" @change="edittype" style="width: 480px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ <el-select v-model="form.type" placeholder="璇烽�夋嫨" @change="edittype" style="width: 100%;">
+ <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
</template>
</el-form-item>
@@ -202,7 +196,7 @@
<el-col :span="11" :offset="2">
<el-form-item label="鍗曚綅">
<template>
- <el-input v-model="unitrow" :disabled="true" placeholder="璇疯緭鍏ュ崟浣�" style="width: 200px;"></el-input>
+ <el-input v-model="unitrow" :disabled="true" placeholder="璇疯緭鍏ュ崟浣�" style="width: 100%;"></el-input>
</template>
</el-form-item>
</el-col>
@@ -224,10 +218,7 @@
<div class="choose">
<span>绫诲瀷锛�</span>
<el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
<!-- <span>宸ュ簭锛�</span>
<el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
@@ -261,10 +252,11 @@
<!-- 涓讳綋鍙� -->
<div class="right">
<el-table
+ height="calc(90vh - 200px)"
:data="tableData"
- style="width: 100%;margin-bottom: 20px;height: 600px;overflow: auto;"
row-key="rowId"
border
+ @select-all="selectAll"
@select="selectTr"
@selection-change="handleSelectionChange"
default-expand-all
@@ -333,6 +325,7 @@
export default {
data() {
return {
+ bigType: [],
search: {
type: 0,
technology: null
@@ -351,6 +344,7 @@
upData:{
},
+
checkTreeNode:{
id:1,
},
@@ -375,10 +369,19 @@
},
mounted() {
+ this.chooseType()
this.selectAllleft()
this.selectAllTeque()
},
methods:{
+ chooseType() {
+ this.$axios.get(this.$api.url.chooseType).then(res => {
+ this.bigType = res.data
+ this.typeselect = res.data[0]
+ console.log(this.typeselect);
+ this.search.type = res.data[0]
+ })
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -606,23 +609,17 @@
},
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.forEach((el,idx) =>{
- // delete idx[0]
- // })
- cc.splice(0,1)
- console.log(cc);
- 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)
+ })
+ }
+ })
+ console.log(ee);
+ this.delete = ee.join(',')
console.log(this.delete);
this.delAllQue()
this.$message.success('鍒犻櫎瀹屾垚')
@@ -639,6 +636,7 @@
// },
handleSelectionChange(val) {
this.selects = val
+ // console.log(this.selects);
this.deleteList = [];
val.forEach((v) => {
if (v.id !== undefined) {
@@ -646,13 +644,15 @@
}
});
},
- // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
- // 鍏ㄩ��/鍙栨秷閫夋搷浣�
- selectAll(val) {
- this.isAllSelect = !this.isAllSelect;
- let data = this.tableData;
+ // 鍏ㄩ��/鍙栨秷閫夋搷浣�
+ selectAll(val) {
+ // console.log(val);
+ this.isAllSelect = !this.isAllSelect;
+ let data = this.tableData;
+ this.$nextTick(() =>{
this.toggleSelect(data, this.isAllSelect, "all");
- },
+ })
+ },
//閫夋嫨鏌愯
selectTr(selection, row) {
console.log(selection,row);
@@ -663,10 +663,19 @@
});
},
+ 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) {
if (type === "all") {
- console.log('222');
if (data.length > 0) {
data.forEach((item) => {
this.toggleSelection(item, flag);
@@ -685,7 +694,6 @@
}
}
},
-
}
}
</script>
@@ -770,7 +778,9 @@
.thing .right {
width: calc(100% - 305px);
height: calc(100% - 25px);
- overflow: hidden;
+ /* overflow: hidden; */
+ overflow-y: scroll;
+ overflow-x: scroll;
padding: 10px;
}
--
Gitblit v1.9.3