From 7cafed0404a6fa12ef56d85d08da7bf5115ba7e5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 24 二月 2025 09:44:16 +0800
Subject: [PATCH] 电缆配置、辅助线芯配置页面搬迁
---
src/views/business/productOrder/components/auxiliaryWireCore.vue | 154 +++++++++++++++------------------------------------
1 files changed, 46 insertions(+), 108 deletions(-)
diff --git a/src/views/business/productOrder/components/auxiliaryWireCore.vue b/src/views/business/productOrder/components/auxiliaryWireCore.vue
index f49c70c..926ee8c 100644
--- a/src/views/business/productOrder/components/auxiliaryWireCore.vue
+++ b/src/views/business/productOrder/components/auxiliaryWireCore.vue
@@ -1,60 +1,42 @@
<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="standardMethodListId">
+ <el-select v-model="auxiliaryWireCore.standardMethodListId" 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>
</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"
+ :row-class-name="tableRowClassName" border class="el-table" :height="'calc(100vh - 200px)'"
+ 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>
@@ -132,11 +114,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,
@@ -286,7 +269,7 @@
},
selectsStandardMethodByFLSSM2() {
this.standards = []
- this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ selectsStandardMethodByFLSSM({
tree: this.$parent.selectTree
}).then(res => {
try {
@@ -294,7 +277,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
@@ -330,7 +313,7 @@
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,
@@ -357,21 +340,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 +377,14 @@
</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;
+ justify-content: space-between;
}
-
-.search_thing {
- width: 300px;
- display: flex;
- align-items: center;
-}
-
-.search_label {
- width: 100px;
- font-size: 14px;
- text-align: right;
-}
-
.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;
--
Gitblit v1.9.3