From d9b0421105565ea402b315d657bed27025cc4afb Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 15 四月 2025 17:26:42 +0800
Subject: [PATCH] 修改能力范围：添加频次，标准收费分组
---
src/views/business/productOrder/components/auxiliaryWireCore.vue | 224 +++++++++++++++++--------------------------------------
1 files changed, 71 insertions(+), 153 deletions(-)
diff --git a/src/views/business/productOrder/components/auxiliaryWireCore.vue b/src/views/business/productOrder/components/auxiliaryWireCore.vue
index f49c70c..d65625f 100644
--- a/src/views/business/productOrder/components/auxiliaryWireCore.vue
+++ b/src/views/business/productOrder/components/auxiliaryWireCore.vue
@@ -1,73 +1,46 @@
<template>
<div class="ins_order_config">
- <div>
- <el-row class="title">
- <el-col :span="6" style="padding-left: 20px;text-align: left;">杈呭姪绾胯姱閰嶇疆</el-col>
- <el-col :span="18" style="text-align: right;">
- <el-button size="medium" @click="outConfig">
- <span style="color: #3A7BFA;">杩� 鍥�</span>
- </el-button>
- <el-button size="medium" type="primary" @click="save">淇� 瀛�</el-button>
- </el-col>
- </el-row>
- </div>
- <div class="search">
- <el-radio-group v-model="currentTab" size="small" style="margin-left: 20px;" @input="changeTab">
- <el-radio-button label="缁濈紭">缁� 缂�</el-radio-button>
- <!-- <el-radio-button label="鎶ゅ">鎶� 濂�</el-radio-button>-->
- </el-radio-group>
- <div v-if="currentTab=='缁濈紭'" class="search_thing">
- <div class="search_label">鑺暟锛�</div>
- <el-select v-model="auxiliaryWireCore.num" allow-create
- clearable
- default-first-option
- filterable
- multiple
- size="small">
- <el-option v-for="item in quantityList" :key="item.value" :label="item.label" :value="item.value"></el-option>
- </el-select>
+ <div class="search_form">
+ <div class="search_input">
+ <el-radio-group v-model="currentTab" size="small" style="margin-right: 20px;" @input="changeTab">
+ <el-radio-button label="缁濈紭">缁� 缂�</el-radio-button>
+ </el-radio-group>
+ <el-form :model="auxiliaryWireCore" ref="entity" size="small" :inline="true">
+ <el-form-item label="鑺暟" prop="num">
+ <el-select v-model="auxiliaryWireCore.num" allow-create clearable default-first-option filterable multiple
+ size="small">
+ <el-option v-for="item in quantityList" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="妫�楠屾爣鍑�" prop="standardMethodListIds">
+ <el-select v-model="auxiliaryWireCore.standardMethodListIds" disabled placeholder="璇烽�夋嫨妫�楠屾爣鍑�" size="small"
+ @change="(value) => methodChange(value)" multiple>
+ <el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
</div>
-<!-- <div v-if="currentTab=='缁濈紭'" class="search_thing">-->
-<!-- <div class="search_label">鍨嬪彿鍙傛暟锛�</div>-->
-<!-- <el-input v-model="auxiliaryWireCore.modelNum" clearable size="small"-->
-<!-- @input="methodChange(auxiliaryWireCore.standardMethodListId)"></el-input>-->
-<!-- </div>-->
- <div v-if="currentTab=='缁濈紭'" class="search_thing">
- <div class="search_label">妫�楠屾爣鍑嗭細</div>
- <el-select v-model="auxiliaryWireCore.standardMethodListId" disabled placeholder="璇烽�夋嫨妫�楠屾爣鍑�"
- size="small"
- @change="(value)=>methodChange(value)">
- <el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id">
- </el-option>
- </el-select>
+ <div>
+ <el-button size="small" @click="outConfig">杩� 鍥�</el-button>
+ <el-button size="small" type="primary" @click="save">淇� 瀛�</el-button>
</div>
- <!-- <div class="search_thing" v-if="currentTab=='鎶ゅ'">-->
- <!-- <div class="search_label">妫�楠屾爣鍑嗭細</div>-->
- <!-- <el-select v-model="sheath.standardMethodListId" placeholder="璇烽�夋嫨妫�楠屾爣鍑�" size="small"-->
- <!-- disabled-->
- <!-- @change="(value)=>methodChange(value)">-->
- <!-- <el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id">-->
- <!-- </el-option>-->
- <!-- </el-select>-->
- <!-- </div>-->
</div>
<div class="table">
- <el-table ref="productTable" v-loading="getProductLoad" :data="productList"
- :row-class-name="tableRowClassName" border class="el-table" height="100%"
- style="margin-bottom: 10px;" tooltip-effect="dark" @select="upProductSelect"
- @selection-change="selectProduct" @select-all="handleAll">
+ <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName"
+ border class="el-table" :height="'calc(100vh - 200px)'"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" tooltip-effect="dark" @select="upProductSelect"
+ @selection-change="selectProduct" @select-all="handleAll">
<el-table-column :selectable="selectable" type="selection" width="65"></el-table-column>
- <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
+ <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass"
+ show-overflow-tooltip></el-table-column>
<el-table-column label="妫�楠岄」" min-width="140" prop="inspectionItem" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」</span>
- <el-input
- v-if="active==1"
- v-model="inspectionItem"
- placeholder="璇疯緭鍏�"
- size="mini"
- @input="searchFilterList"/>
+ <el-input v-if="active == 1" v-model="inspectionItem" placeholder="璇疯緭鍏�" size="mini"
+ @input="searchFilterList" />
</div>
</template>
</el-table-column>
@@ -75,36 +48,31 @@
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」瀛愰」</span>
- <el-input
- v-if="active==1"
- v-model="inspectionItemSubclass"
- placeholder="璇疯緭鍏�"
- size="mini"
- @input="searchFilterList"/>
+ <el-input v-if="active == 1" v-model="inspectionItemSubclass" placeholder="璇疯緭鍏�" size="mini"
+ @input="searchFilterList" />
</div>
</template>
</el-table-column>
<el-table-column label="瑕佹眰鎻忚堪" min-width="220px" prop="tell">
<template slot-scope="scope">
- <el-input v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
- size="small" type="textarea"></el-input>
+ <el-input v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="瑕佹眰鎻忚堪"
+ size="small" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="瑕佹眰鍊�" min-width="220px" prop="ask">
<template slot-scope="scope">
- <el-input v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鍊�"
- size="small" type="textarea"></el-input>
+ <el-input v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="瑕佹眰鍊�"
+ size="small" type="textarea"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
<template slot-scope="scope">
- <el-input v-if="!scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙')" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
- size="small" type="textarea">
+ <el-input v-if="!scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙')" v-model="scope.row.radius"
+ :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="瑕佹眰鎻忚堪" size="small" type="textarea">
</el-input>
<el-select v-if="scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙')" v-model="scope.row.radius" clearable
- placeholder="鏉′欢"
- size="small">
- <el-option v-for="(a,i) in JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option>
+ placeholder="鏉′欢" size="small">
+ <el-option v-for="(a, i) in JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option>
</el-select>
</template>
</el-table-column>
@@ -112,12 +80,7 @@
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
- <el-input
- v-if="active==1"
- v-model="methodS"
- placeholder="璇疯緭鍏�"
- size="mini"
- @input="searchFilterList"/>
+ <el-input v-if="active == 1" v-model="methodS" placeholder="璇疯緭鍏�" size="mini" @input="searchFilterList" />
</div>
</template>
</el-table-column>
@@ -132,11 +95,12 @@
<script>
import { Tree } from 'element-ui'
+import { selectsStandardMethodByFLSSM, selectStandardProductList } from "@/api/business/rawMaterialOrder";
export default {
props: {
active: {
- type: Number,
- default: () => 0
+ type: String,
+ default: () => '0'
},
sampleSelectionList: {
type: Array,
@@ -160,7 +124,7 @@
tree: '',
standards: [],
auxiliaryWireCore: {
- standardMethodListId: null,
+ standardMethodListIds: [],
insProduct: [],
num: [],
modelNum: ''
@@ -219,17 +183,17 @@
}
},
// 瑕佹眰鍊煎彉鍖栨椂
- requestChange(e, row,type) {
+ requestChange(e, row, type) {
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
item.insProduct.map(i => {
- if(i.id == row.id){
- if(row.repetitionTag){
- if(row.repetitionTag==i.repetitionTag){
+ if (i.id == row.id) {
+ if (row.repetitionTag) {
+ if (row.repetitionTag == i.repetitionTag) {
i[type] = e
}
- }else{
- if(!i.repetitionTag){
+ } else {
+ if (!i.repetitionTag) {
i[type] = e
}
}
@@ -268,10 +232,7 @@
this.$refs.productTable.doLayout()
})
},
- tableRowClassName({
- row,
- rowIndex
- }) {
+ tableRowClassName({ row, rowIndex }) {
if (row.state === 0) {
return '';
}
@@ -286,7 +247,7 @@
},
selectsStandardMethodByFLSSM2() {
this.standards = []
- this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ selectsStandardMethodByFLSSM({
tree: this.$parent.selectTree
}).then(res => {
try {
@@ -294,7 +255,7 @@
let arr = this.selectTree.split('-')
let arr0 = arr.slice(0, arr.length - 1)
let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
- this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ selectsStandardMethodByFLSSM({
tree: selectTree
}).then(ress => {
this.standards = ress.data.standardMethodList
@@ -305,7 +266,7 @@
} catch (e) {
}
})
- this.auxiliaryWireCore.standardMethodListId = this.sampleSelectionList[0].standardMethodListId
+ this.auxiliaryWireCore.standardMethodListIds = this.sampleSelectionList[0].standardMethodListId
// 鏌ヨ妫�娴嬫爣鍑嗕笅鎷夋閫夐」
if (this.auxiliaryWireCore.insProduct.length > 0) {
this.productList = this.auxiliaryWireCore.insProduct
@@ -319,7 +280,7 @@
}
},
methodChange(val) {
- if (val === null || val === '') return
+ if (!val || val.length < 1) return
this.getProductLoad = true
let standard = this.standards.find(a => a.id === val)
this.isAskOnlyRead = standard != null && standard.code === '鎶�鏈姹�';
@@ -330,10 +291,10 @@
const conductorMaterial = this.sampleSelectionList[0].conductorMaterial
const conductorType = this.sampleSelectionList[0].conductorType
const modelNum = this.sampleSelectionList[0].modelNum
- this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ selectStandardProductList({
model: this.$parent.addObj.model ? this.$parent.addObj.model : model,
modelNum: modelNum,
- standardMethodListId: val,
+ standardMethodListIds: val,
factory: selectTreeList.join(" - "),
cores: cores,
conductorMaterial: conductorMaterial,
@@ -357,21 +318,16 @@
this.$refs.productTable.toggleRowSelection(row, true);
},
save() {
- // if(this.auxiliaryWireCore.insProduct.length === 0 && this.sheath.insProduct.length === 0){
- // this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
- // return
- // }
if (this.auxiliaryWireCore.insProduct.length !== 0) {
if (this.auxiliaryWireCore.num.length === 0) {
this.$message.error('缂哄皯鑺暟鏃犳硶淇濆瓨')
return
}
}
- // this.sample.forEach(a=>{
- // a.auxiliaryWireCore = this.auxiliaryWireCore
- // a.sheath = this.sheath
- // })
- this.auxiliaryWireCore.insProduct = this.productList
+ this.auxiliaryWireCore.insProduct = this.HaveJson(this.productList)
+ this.auxiliaryWireCore.insProduct.forEach(a => {
+ delete a.id
+ })
if (this.currentTab === '缁濈紭') {
this.sample.forEach(a => {
a.auxiliaryWireCore = this.auxiliaryWireCore
@@ -399,54 +355,16 @@
</script>
<style scoped>
-.ins_order_config {
- width: 100%;
- height: 100%;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-.ins_order_config::-webkit-scrollbar {
- width: 0;
-}
-
-.title {
- height: 60px;
- line-height: 60px;
-}
-
-.search {
- background-color: #fff;
- height: 80px;
+.search_form {
display: flex;
- align-items: center;
-}
-
-.search_thing {
- width: 300px;
- display: flex;
- align-items: center;
-}
-
-.search_label {
- width: 100px;
- font-size: 14px;
- text-align: right;
+ justify-content: space-between;
}
.search_input {
- width: calc(100% - 70px);
+ display: flex;
+ justify-content: space-between;
}
-.table {
- margin-top: 10px;
- background-color: #fff;
- width: calc(100% - 40px);
- height: calc(100% - 60px - 80px - 26px - 24px);
- padding: 20px;
-}
-</style>
-<style>
.ins_order_config .has-gutter .el-table__cell .cell {
line-height: 30px;
background-color: #fafafa;
@@ -460,7 +378,7 @@
font-size: 12px;
}
-.ins_order_config .el-table .warning-row .cell {
- color: #3A7BFA;
+>>>.warning-row {
+ color: #1890FF;
}
</style>
--
Gitblit v1.9.3