From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard.vue | 164 +++++++++++++++++++++---------------------------------
1 files changed, 65 insertions(+), 99 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index d40f8cb..51facba 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -147,7 +147,7 @@
color: #bababa;
}
- .el-table-filter__list{
+ .el-table-filter__list {
max-height: 400px;
overflow-y: auto;
}
@@ -398,17 +398,18 @@
</div>
<div style="flex: 1;overflow-y: auto;" v-loading="productTableLoading0">
<el-table :data="productList0" ref="productTable0" style="width: 100%;" height="94%" tooltip-effect="dark"
- stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0" filter-placement="bottom-start"
- header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler">
+ stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0"
+ header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler" highlight-current-row>
<el-table-column type="selection" width="50">
</el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip :filters="filters0"
- :filter-multiple="false" column-key="inspectionItem"></el-table-column>
+ :filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140" show-overflow-tooltip
- :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass"></el-table-column>
+ :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass"
+ filter-placement="bottom-start"></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
- :filter-multiple="false" column-key="sonLaboratory"></el-table-column>
+ :filter-multiple="false" column-key="sonLaboratory" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="200px"></el-table-column>
<el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" width="200"></el-table-column>
@@ -577,32 +578,8 @@
},
methodList: [],
productTableLoading0: false,
- filters0: [{
- text: '娴嬭瘯',
- value: 0,
- },
- {
- text: '娴嬭瘯1',
- value: 1,
- },
- {
- text: '娴嬭瘯2',
- value: 2,
- }
- ],
- filters1: [{
- text: '娴嬭瘯',
- value: 0,
- },
- {
- text: '娴嬭瘯1',
- value: 1,
- },
- {
- text: '娴嬭瘯2',
- value: 2,
- }
- ],
+ filters0: [],
+ filters1: [],
pages: 1,
inspectionItem: null,
inspectionItemSubclass: null,
@@ -941,12 +918,10 @@
},
upStandardProductList(value, index) {
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: index,
- ask: value
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: index,
+ ask: value
+ })
}).then(res => {
if (res.code == 201) {
this.$message.error('鏈繚瀛�')
@@ -957,12 +932,10 @@
},
upStandardProductListOfTell(value, index) {
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: index,
- tell: value
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: index,
+ tell: value
+ })
}).then(res => {
if (res.code == 201) {
this.$message.error('鏈繚瀛�')
@@ -973,12 +946,10 @@
},
upStandardProductListOfMethodS(value, index) {
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: index,
- methodS: value
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: index,
+ methodS: value
+ })
}).then(res => {
if (res.code == 201) {
this.$message.error('鏈繚瀛�')
@@ -989,12 +960,10 @@
},
upStandardProductListOfPrice(value, index) {
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: index,
- price: value
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: index,
+ price: value
+ })
}).then(res => {
if (res.code == 201) {
this.$message.error('鏈繚瀛�')
@@ -1005,12 +974,10 @@
},
upStandardProductListOfManHour(value, index) {
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: index,
- manHour: value
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: index,
+ manHour: value
+ })
}).then(res => {
if (res.code == 201) {
this.$message.error('鏈繚瀛�')
@@ -1021,12 +988,10 @@
},
upStandardProductListOfTemplate(value, index) {
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: index,
- templateId: value
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: index,
+ templateId: value
+ })
}).then(res => {
if (res.code == 201) {
this.$message.error('鏈繚瀛�')
@@ -1138,12 +1103,10 @@
upProductSelect(selection, row) {
row.state = (row.state == 1 ? 0 : 1)
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: row.id,
- state: row.state
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: row.id,
+ state: row.state
+ })
}).then(res => {
if (res.code == 201) {
this.$message.error('鏈繚瀛�')
@@ -1154,20 +1117,20 @@
},
filterHandler(value) {
for (let column in value) {
- if(value[column].length === 0){
- if(column==='inspectionItem'){
+ if (value[column].length === 0) {
+ if (column === 'inspectionItem') {
this.inspectionItem = null
- }else if(column === 'inspectionItemSubclass'){
+ } else if (column === 'inspectionItemSubclass') {
this.inspectionItemSubclass = null
- }else if(column === 'sonLaboratory'){
+ } else if (column === 'sonLaboratory') {
this.sonLaboratory = null
}
- }else{
- if(column==='inspectionItem'){
+ } else {
+ if (column === 'inspectionItem') {
this.inspectionItem = value[column][0]
- }else if(column === 'inspectionItemSubclass'){
+ } else if (column === 'inspectionItemSubclass') {
this.inspectionItemSubclass = value[column][0]
- }else if(column === 'sonLaboratory'){
+ } else if (column === 'sonLaboratory') {
this.sonLaboratory = value[column][0]
}
}
@@ -1246,16 +1209,14 @@
this.sectionLoad = true
if (this.moreSelects.length === 0) {
this.$axios.post(this.$api.standardTree.upStandardProductList, {
- id: this.sectionRow.id,
- section: this.sectionRow.section,
- ask: this.sectionRow.ask,
- tell: this.sectionRow.tell,
- price: this.sectionRow.price,
- manHour: this.sectionRow.manHour
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ str: JSON.stringify({
+ id: this.sectionRow.id,
+ section: this.sectionRow.section,
+ ask: this.sectionRow.ask,
+ tell: this.sectionRow.tell,
+ price: this.sectionRow.price,
+ manHour: this.sectionRow.manHour
+ })
}).then(res => {
this.sectionLoad = false
if (res.code == 201) {
@@ -1341,8 +1302,13 @@
return this.$message.error('璇烽�夋嫨妫�楠岄」')
}
this.moreEditLoad = true
+ for (let a in this.moreInfo) {
+ if (this.moreInfo[a] == '') {
+ delete this.moreInfo[a]
+ }
+ }
this.$axios.post(this.$api.standardTree.upStandardProducts, {
- ids: this.moreSelects.map(a => a.id),
+ ids: JSON.stringify(this.moreSelects.map(a => a.id)),
standardProductList: this.moreInfo
}, {
headers: {
@@ -1418,21 +1384,21 @@
this.currentPage0 = e;
this.getList()
},
- getItemEnum(){
- this.$axios.post(this.$api.standardTree.selectStandardProductEnumByMethodId,{
+ getItemEnum() {
+ this.$axios.post(this.$api.standardTree.selectStandardProductEnumByMethodId, {
id: this.standardId,
tree: this.selectTree
- }).then(res=>{
+ }).then(res => {
this.filters0 = []
this.filters1 = []
- res.data.item.forEach(a=>{
+ res.data.item.forEach(a => {
this.filters0.push({
text: a.inspectionItem,
value: a.inspectionItem
})
})
- res.data.items.forEach(a=>{
- if(a!=null){
+ res.data.items.forEach(a => {
+ if (a != null) {
this.filters1.push({
text: a.inspectionItemSubclass,
value: a.inspectionItemSubclass
--
Gitblit v1.9.3