From 4bad62e4fd67ba8759f79263e4b08bf9ab6d64d0 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 31 五月 2024 15:59:56 +0800
Subject: [PATCH] 消息通知样式优化
---
src/components/do/b1-ins-order/fiberoptic-config.vue | 325 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 235 insertions(+), 90 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index e0f9d2f..6b301fa 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -6,7 +6,7 @@
<el-col :span="18" style="text-align: right;">
<el-button size="medium" type="primary" @click="save" :loading="saveLoad">淇� 瀛�</el-button>
<el-button size="medium" @click="outConfig">
- <span style="color: #3A7BFA;">鍙� 娑�</span>
+ <span style="color: #3A7BFA;">杩� 鍥�</span>
</el-button>
</el-col>
</el-row>
@@ -39,23 +39,25 @@
</div>
<div class="search-item">
<label style="width: 70px;">妫�娴嬮噺</label>
- <el-input v-model="packageInfo.num3" placeholder="璇疯緭鍏�" size="small" @change="upNum" :disabled="packageInfo.radio===0"></el-input>
+ <el-input v-model="packageInfo.num3" placeholder="璇疯緭鍏�" size="small" @change="upNum"
+ :disabled="packageInfo.radio===0"></el-input>
</div>
</div>
- <el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px"
- size="small" @selection-change="handleSelectionChange1">
+ <el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px" size="small"
+ @selection-change="handleSelectionChange1">
<el-table-column type="selection" width="45">
</el-table-column>
<el-table-column label="绠¤壊鏍�" show-overflow-tooltip>
<template slot-scope="scope">
<el-select v-model="scope.row.color" size="mini">
- <el-option v-for="(color,i) in colors" :key="i" :label="color.lable" :value="color.value"></el-option>
+ <el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
+ :value="color.value"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="num2" label="鏍囬噺" show-overflow-tooltip>
+ <el-table-column prop="num2" label="鏍囬噺" show-overflow-tooltip align="center">
</el-table-column>
- <el-table-column prop="num3" label="娴嬭瘯閲�" show-overflow-tooltip>
+ <el-table-column prop="num3" label="娴嬭瘯閲�" show-overflow-tooltip align="center">
</el-table-column>
</el-table>
</div>
@@ -63,7 +65,7 @@
<el-col :span="15">
<div class="grid-content">
<h5>妫�娴嬮」淇℃伅</h5>
- <el-table ref="table1" :data="detectionItems" tooltip-effect="dark" style="width: 100%"
+ <el-table ref="productTable" :data="detectionItems" tooltip-effect="dark" style="width: 100%"
:row-class-name="tableRowClassName"
:header-cell-class-name="setClassName"
height="283px"
@@ -79,13 +81,13 @@
</el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" show-overflow-tooltip width="100px">
</el-table-column>
- <el-table-column prop="methodS" label="璇曢獙鏂规硶" show-overflow-tooltip>
+ <el-table-column prop="methodS" label="璇曢獙鏂规硶" min-width="90" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="price" label="鍗曚环" width="70" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" width="70" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="manDay" label="棰勮鏃堕棿" show-overflow-tooltip>
+ <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
<template slot-scope="scope">
@@ -99,64 +101,72 @@
<el-row :gutter="10">
<el-col :span="12">
<div class="grid-content">
- <h5>鍏夌氦甯�<el-button size="mini" type="primary" class="btns">鐢熸垚鍏夌氦甯�</el-button></h5>
+ <h5>鍏夌氦甯�
+ <el-button size="mini" type="primary" class="btns" @click="addFibers"
+ :disabled="packageInfo.ismiers===false||miresModel===null||miresStandard===null">鐢熸垚鍏夌氦甯�</el-button>
+ <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0">娓呴櫎</el-button>
+ </h5>
<div
style="display: flex;align-items: center;justify-content: space-between;margin:4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
<div class="search-item" style="width: 50%;margin-right: 16px;">
<label style="width: 80px;">绾ゅ甫绫诲瀷</label>
- <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" :disabled="selectBushing.length===0">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+ <el-select v-model="miresModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ :disabled="selectBushing.length===0">
+ <el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div class="search-item" style="width: 50%;">
<label style="width: 80px;">鍙傝�冩爣鍑�</label>
- <el-select v-model="tape.value" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+ <el-select v-model="miresStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ :disabled="miresModel===null" @focus="selectsStandardMethodByFLSSM2()"
+ @change="(value)=>methodChange2(value)">
+ <el-option v-for="item in miresStandards" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
</div>
</div>
- <el-table ref="table2" :data="tableData" tooltip-effect="dark" style="width: 100%" height="270px"
- size="small" @selection-change="handleSelectionChange3">
+ <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
+ size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="rowClickFiber">
<el-table-column type="selection" width="55">
</el-table-column>
- <el-table-column label="鍏夌氦甯︾紪鍙�" show-overflow-tooltip>
- <template slot-scope="scope">{{ scope.row.date }}</template>
+ <el-table-column prop="code" label="鍏夌氦甯︾紪鍙�" show-overflow-tooltip align="center">
</el-table-column>
- <el-table-column prop="name" label="鍏夌氦甯﹁鏍�" show-overflow-tooltip>
+ <el-table-column prop="model" label="鍏夌氦甯﹁鏍�" show-overflow-tooltip align="center">
</el-table-column>
- <el-table-column prop="address" label="鍙傝�冩爣鍑�" show-overflow-tooltip>
+ <el-table-column prop="standard" label="鍙傝�冩爣鍑�" show-overflow-tooltip align="center">
</el-table-column>
- <el-table-column prop="address" label="鍏夌氦妫�娴嬮噺" show-overflow-tooltip>
+ <el-table-column prop="num" label="鍏夌氦妫�娴嬮噺" show-overflow-tooltip align="center">
</el-table-column>
</el-table>
</div>
</el-col>
<el-col :span="12">
<div class="grid-content">
- <h5>鍏夌氦<el-button size="mini" type="primary" class="btns" @click="addFiber" :disabled="mireModel===null||mireStandard===null">鍏夌氦閰嶈壊</el-button></h5>
+ <h5>鍏夌氦<el-button size="mini" type="primary" class="btns" @click="addFiber"
+ :disabled="mireModel===null||mireStandard===null">鍏夌氦閰嶈壊</el-button></h5>
<div
style="display: flex;align-items: center;justify-content: space-between;margin: 4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
<div class="search-item" style="width: 50%;margin-right: 16px;">
<label style="width: 80px;">鍏夌氦绫诲瀷</label>
- <el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" :disabled="selectBushing.length===0">
+ <el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ :disabled="selectBushing.length===0">
<el-option v-for="(item,a) in mireModels" :key="a" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div class="search-item" style="width: 50%;">
<label style="width: 80px;">鍙傝�冩爣鍑�</label>
- <el-select v-model="mireStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" :disabled="mireModel===null"
- :loading="mireStandardLoading"
- @focus="selectsStandardMethodByFLSSM()" @change="(value)=>methodChange(value)">
+ <el-select v-model="mireStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
+ :disabled="mireModel===null" @focus="selectsStandardMethodByFLSSM()"
+ @change="(value)=>methodChange(value)" :loading="mireStandardLoading">
<el-option v-for="item in mireStandards" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
</div>
</div>
<el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
- size="small" @selection-change="handleSelectionChange4"
+ size="small" highlight-current-row @selection-change="handleSelectionChange4"
@row-click="rowClickFiber">
<el-table-column type="selection" width="55">
</el-table-column>
@@ -165,7 +175,8 @@
<el-table-column prop="color" label="鍏夌氦鑹叉爣" width="120">
<template slot-scope="scope">
<el-select v-model="scope.row.color" size="mini">
- <el-option v-for="(color,i) in colors" :key="i" :label="color.lable" :value="color.value"></el-option>
+ <el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
+ :value="color.value"></el-option>
</el-select>
</template>
</el-table-column>
@@ -207,9 +218,16 @@
mireModel: null,
mireStandard: [],
mireStandards: null,
+ miresModels: [],
+ miresModel: null,
+ miresStandard: [],
+ miresStandards: null,
selectBushing: [],
productList: [],
+ productList2: [],
fiberList: [],
+ fibersList: [],
+ selectFibers: [],
detectionItems:[],
currentDetectionItems:null,
mireStandardLoading:false,
@@ -229,7 +247,6 @@
this.multiFiberList = []
this.detectionItems = []
this.currentDetectionItems = null;
- this.mireStandard = null;
}
},
mireStandard(val1,val0) {
@@ -242,70 +259,86 @@
}
},
mounted() {
- this.$parent.sampleIds.forEach(a=>{
+ this.$parent.sampleIds.forEach(a => {
for (var i = 0; i < this.$parent.sampleList.length; i++) {
if (this.$parent.sampleList[i].id == a) {
this.sample.push(this.$parent.sampleList[i])
- this.models+=(','+this.$parent.sampleList[i].model)
+ this.models += (',' + this.$parent.sampleList[i].model)
break
}
}
})
- this.models = this.models.replace(',','')
+ this.models = this.models.replace(',', '')
+ this.packageInfo.ismiers = this.models.split(',').every(e=>e.indexOf('d')>-1)
+ if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
+ this.bushing = []
+ }else{
+ this.bushing = this.HaveJson(this.sample[0].bushing)
+ this.packageInfo.num1 = this.sample[0].bushing.length
+ this.packageInfo.num2 = this.sample[0].bushing[0].num2
+ this.packageInfo.num3 = this.sample[0].bushing[0].num3
+ this.bushing.forEach(a=>{
+ if(this.packageInfo.ismiers){
+ a.fibers.forEach(b=>{
+ this.fibersList.push(b)
+ b.fiber.forEach(c=>{
+ this.fiberList.push(c)
+ })
+ })
+ }else{
+ a.fiber.forEach(b=>{
+ this.fiberList.push(b)
+ })
+ }
+ })
+ }
this.getTypeDicts1()
- this.getTypeDicts2()
this.getStandTreeBySampleType()
+ this.getStandTreeBySampleType2()
},
methods: {
- save() {},
- handleSelectionChange(val) {},
- handleSelectionChange1(val){
+ handleSelectionChange(val) {
+ this.selectFibers = val
+ this.multiFiberList = val
+ },
+ handleSelectionChange1(val) {
this.selectBushing = val
- this.mireModel = null
},
handleSelectionChange2(val){},
- handleSelectionChange3(val){
- this.detectionItems = this.HaveJson(this.productList)
- },
handleSelectionChange4(val){
this.multiFiberList = val
- this.detectionItems = this.HaveJson(this.productList)
},
- outConfig(){
+ outConfig() {
this.$parent.configShow = false
},
getTypeDicts1() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "鑹叉爣"
- }).then(res => {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "鑹叉爣"
+ }).then(res => {
this.colors = res.data
- })
+ })
},
- getTypeDicts2() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "绾胯姱"
- }).then(res => {
- this.wires = res.data
- })
- },
- upNum(){
- if(this.packageInfo.radio === 0){
+ upNum() {
+ this.fiberList = []
+ this.fibersList = []
+ this.detectionItems = []
+ if (this.packageInfo.radio === 0) {
this.packageInfo.num3 = this.packageInfo.num2
}
- if(parseInt(this.packageInfo.num2) < parseInt(this.packageInfo.num3)){
+ if (parseInt(this.packageInfo.num2) < parseInt(this.packageInfo.num3)) {
this.packageInfo.num3 = this.packageInfo.num2
}
- if(this.packageInfo.num1!==null&&this.packageInfo.num1!==''
- &&this.packageInfo.num2!==null&&this.packageInfo.num2!==''
- &&this.packageInfo.num3!=null&&this.packageInfo.num3!==''){
+ if (this.packageInfo.num1 !== null && this.packageInfo.num1 !== '' &&
+ this.packageInfo.num2 !== null && this.packageInfo.num2 !== '' &&
+ this.packageInfo.num3 != null && this.packageInfo.num3 !== '') {
let colors2 = []
- if(this.packageInfo.num1 / this.colors.length > 1){
+ if (this.packageInfo.num1 / this.colors.length > 1) {
let num = this.packageInfo.num1 / this.colors.length
- if(this.packageInfo.num1 % this.colors.length > 0) num+=1
+ if (this.packageInfo.num1 % this.colors.length > 0) num += 1
for (var i = 0; i < num; i++) {
colors2 = colors2.concat(this.colors)
}
- }else{
+ } else {
colors2 = colors2.concat(this.colors)
}
this.bushing = []
@@ -314,26 +347,39 @@
color: colors2[i].label,
num2: this.packageInfo.num2,
num3: this.packageInfo.num3,
- ismiers: this.packageInfo.ismiers,
fibers: [],
fiber: []
}
this.bushing.push(bushing)
}
- }else{
+ } else {
this.bushing = []
}
},
- getStandTreeBySampleType(){
- this.$axios.post(this.$api.standardTree.getStandTreeBySampleType,{
+ getStandTreeBySampleType() {
+ this.$axios.post(this.$api.standardTree.getStandTreeBySampleType, {
laboratory: '閫氫俊浜у搧瀹為獙瀹�',
- sampleType:'鍏夌氦',
- }).then(res=>{
+ sampleType: '鍏夌氦'
+ }).then(res => {
this.mireModels = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
this.mireModels.push({
label: a.model,
value: a.sample + ' - ' + a.model
+ })
+ })
+ })
+ },
+ getStandTreeBySampleType2() {
+ this.$axios.post(this.$api.standardTree.getStandTreeBySampleType, {
+ laboratory: '閫氫俊浜у搧瀹為獙瀹�',
+ sampleType: '鍏夌氦甯�'
+ }).then(res => {
+ this.miresModels = []
+ res.data.forEach(a => {
+ this.miresModels.push({
+ label: a.sample,
+ value: a.sample
})
})
})
@@ -348,8 +394,16 @@
this.mireStandards = res.data.standardMethodList
})
},
+ selectsStandardMethodByFLSSM2() {
+ this.miresStandards = []
+ this.$axios.post(this.$api.standardTree.selectsStandardMethodByFLSSM, {
+ tree: '涓ぉ绉戞妧妫�娴嬩腑蹇� - 閫氫俊浜у搧瀹為獙瀹� - 鍏夌氦甯� - ' + this.miresModel
+ }).then(res => {
+ this.miresStandards = res.data.standardMethodList
+ })
+ },
methodChange(val) {
- if(val===null||val==='')return
+ if (val === null || val === '') return
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
model: this.mireModel.split(' - ')[1],
standardMethodListId: val,
@@ -359,11 +413,10 @@
'Content-Type': 'application/json'
}
}).then(res => {
- let arr = res.data.map(a => {
+ res.data.forEach(a => {
a.state = 0
- return a
})
- this.productList = arr
+ this.productList = res.data
setTimeout(() => {
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
@@ -371,42 +424,116 @@
}, 200)
})
},
- addFiber(){
+ methodChange2(val) {
+ if (val === null || val === '') return
+ this.$axios.post(this.$api.standardTree.selectStandardProductList, {
+ model: '',
+ standardMethodListId: val,
+ factory: '涓ぉ绉戞妧妫�娴嬩腑蹇� - 閫氫俊浜у搧瀹為獙瀹� - 鍏夌氦甯� - ' + this.miresModel + ' - ',
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ res.data.forEach(a => {
+ a.state = 0
+ })
+ this.productList2 = res.data
+ setTimeout(() => {
+ this.productList2.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ })
+ },
+ addFiber() {
let colors2 = []
- if(this.packageInfo.num1 / this.colors.length > 1){
+ if (this.packageInfo.num1 / this.colors.length > 1) {
let num = this.packageInfo.num1 / this.colors.length
- if(this.packageInfo.num1 % this.colors.length > 0) num+=1
+ if (this.packageInfo.num1 % this.colors.length > 0) num += 1
for (var i = 0; i < num; i++) {
colors2 = colors2.concat(this.colors)
}
- }else{
+ } else {
colors2 = colors2.concat(this.colors)
}
this.fiberList = []
let model = this.mireModel.split(' - ')[1]
- let standard = this.mireStandards.find(a=>a.id == this.mireStandard).code
- this.selectBushing.forEach(a=>{
- for (var i = 0; i < a.num3; i++) {
- if(this.packageInfo.ismiers){
-
- }else{
+ let standard = this.mireStandards.find(a => a.id == this.mireStandard).code
+ if (this.packageInfo.ismiers) {
+ if(this.selectFibers.length === 0){
+ this.$message.error('鏈�夋嫨鍏夌氦甯�')
+ return
+ }
+ this.selectFibers.forEach(a => {
+ a.fiber = []
+ for (var i = 0; i < parseInt(a.num); i++) {
let fiber = {
bushColor: a.color,
color: colors2[i].label,
model: model,
standard: standard,
- productList:this.HaveJson(this.productList),
+ productList: this.HaveJson(this.productList)
}
a.fiber.push(fiber)
this.fiberList.push(fiber)
}
+ })
+ } else {
+ this.selectBushing.forEach(a => {
+ a.fiber = []
+ for (var i = 0; i < parseInt(a.num3); i++) {
+ let fiber = {
+ bushColor: a.color,
+ color: colors2[i].label,
+ model: model,
+ standard: standard,
+ productList: this.HaveJson(this.productList)
+ }
+ a.fiber.push(fiber)
+ this.fiberList.push(fiber)
+ }
+ })
+ }
+ },
+ addFibers() {
+ if(this.selectBushing.length===0){
+ this.$message.error('鏈�夋嫨濂楃')
+ return
+ }
+ this.fibersList = []
+ let standard = this.miresStandards.find(a => a.id == this.miresStandard).code
+ this.packageInfo.ismiers = true
+ this.fiberList = []
+ this.selectBushing.forEach(a => {
+ a.fiber = []
+ a.fibers = []
+ for (var i = 0; i < parseInt(a.num3); i++) {
+ let fibers = {
+ code: null,
+ color: a.color,
+ model: this.miresModel,
+ standard: standard,
+ num: a.num3,
+ productList: this.HaveJson(this.productList2),
+ fiber: []
+ }
+ a.fibers.push(fibers)
+ this.fibersList.push(fibers)
}
})
- console.log(this.productList)
},
rowClickFiber(row, column, event){
this.currentDetectionItems = row
- this.detectionItems = this.HaveJson(this.productList)
+ this.detectionItems = row.productList
+ setTimeout(() => {
+ this.detectionItems.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ },
+ toggleSelection(row) {
+ this.$refs.productTable.toggleRowSelection(row, true);
},
tableRowClassName({
row,
@@ -461,9 +588,8 @@
}
}
this.$nextTick(() => {
- this.$refs.table1.doLayout()
+ this.$refs.productTable.doLayout()
})
- console.log(222,this.currentDetectionItems,this.multiFiberList)
},
upProductSelect(selection, row) {
row.state = row.state == 1 ? 0 : 1
@@ -485,13 +611,32 @@
return m;
});
}
- console.log(1111,this.currentDetectionItems,this.multiFiberList)
},
setClassName({ column }) {
if (column.type == 'selection' && !this.isAllDisabled) {
return 'all-disabled'
}
},
+ clearFibers(){
+ this.packageInfo.ismiers = false
+ this.fibersList = []
+ this.bushing.forEach(a=>{
+ a.fibers = []
+ })
+ },
+ save(){
+ for(let a in this.bushing){
+ if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
+ this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
+ return
+ }
+ }
+ this.sample.forEach(a=>{
+ a.bushing = this.bushing
+ })
+ this.$message.success('宸蹭繚瀛�')
+ console.log(11111111,this.bushing)
+ }
}
}
</script>
--
Gitblit v1.9.3