2024-08-27

src/optionSystem/FProductManage/modules/diefa/diefaAdd.vue

@@ -170,7 +170,7 @@
                             <div class="option-line">
                                 <div class="item">
                                     <div class="label">品牌:</div>
-                                    <MySelect @click="Search('excelParam','actuatorbrand')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
+                                    <MySelect @click="Search('excelParam','actuatorbrand');calcTableHieght('excelRef')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
                                 </div>
                             </div>
 
@@ -520,6 +520,7 @@ export default {
                 let target = this.$refs[id].$el.getBoundingClientRect()
                 let clientHeight = document.body.clientHeight
                 this.tableHeight = clientHeight - target.top - 85 + 'px'
+                this.$refs[id].$refs.table.doLayout()
             })
         },
         //搜索

src/optionSystem/FProductManage/modules/diefa/edit.vue

@@ -170,7 +170,7 @@
                             <div class="option-line">
                                 <div class="item">
                                     <div class="label">品牌:</div>
-                                    <MySelect @click="Search('excelParam','actuatorbrand')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
+                                    <MySelect @click="Search('excelParam','actuatorbrand');calcTableHieght('excelRef')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
                                 </div>
                             </div>
 
@@ -516,6 +516,7 @@
                     let target = this.$refs[id].$el.getBoundingClientRect()
                     let clientHeight = document.body.clientHeight
                     this.tableHeight = clientHeight - target.top - 85 + 'px'
+                    this.$refs[id].$refs.table.doLayout()
                 })
             },
           //搜索

src/optionSystem/FProductManage/modules/select.vue

@@ -112,7 +112,7 @@ export default {
     cursor: pointer;
     display: block;
     padding: 6px 15px;
-    border: 1px solid rgba(217, 217, 217, 1);
+    border: 1px solid rgba(217, 217, 217, 1) !important;
     user-select: none;
 }
 .item:first-child {
@@ -149,7 +149,7 @@ export default {
     font-family: Source Han Sans SC, Source Han Sans SC;
 }
 
-.custom-select2 .item,.item2 {
+.custom-select2 .item,.custom-select2 .item2 {
     border: none !important;
     border-radius: 50px 50px 50px 50px !important; 
 }

src/optionSystem/FProductManage/modules/table.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
       <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
-      <el-table v-loading="loading" ref="table" :row-class-name="tableClassName" highlight-current-row :data="data != undefined ? data : list"  size="mini" :height="height ? height : list.length <= 4?'260px':list.length <= 20?'calc(100vh - 420px)':'calc(100vh - 420px)'"  @row-click="rowClick" style="width:100%;min-height:260px" :header-cell-style="{background:'#fafafafa',height:'40px',color:'#000000'}" @selection-change="selectionChange">
+      <el-table v-loading="loading" ref="table" :row-class-name="tableClassName" highlight-current-row :data="data != undefined ? data : list"  size="mini" :height="height ? height : list.length <= 4?'260px':list.length <= 20?'calc(100vh - 420px)':'calc(100vh - 420px)'"  @row-click="rowClick" style="width:100%;" :header-cell-style="{background:'#fafafafa',height:'40px',color:'#000000'}" @selection-change="selectionChange">
         <el-table-column
             type="selection"
             width="35" fixed v-if="checkbox">

src/optionSystem/optionOrder/detail/modules/components/DieFa.vue

@@ -202,7 +202,7 @@
             <div class="option-line">
                 <div class="item">
                     <div class="label">品牌:</div>
-                    <MySelect @click="Search('excelParam','actuatorbrand')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
+                    <MySelect @click="Search('excelParam','actuatorbrand');calcTableHieght('excelRef')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
                 </div>
             </div>
             <div class="option-line" v-show="guangtouParam.content.where.drivetype=='气动'">
@@ -454,6 +454,7 @@ export default {
                 let target = this.$refs[id].$el.getBoundingClientRect()
                 let clientHeight = document.body.clientHeight
                 this.tableHeight = clientHeight - target.top - 85 + 'px'
+                this.$refs[id].$refs.table.doLayout()
             })
         },
         close () {

src/optionSystem/selectOption/components/DieFa.vue

@@ -81,7 +81,7 @@
             <div class="option-line">
                 <div class="item">
                     <div class="label">品牌:</div>
-                    <MySelect @click="Search('excelParam','actuatorbrand')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
+                    <MySelect @click="Search('excelParam','actuatorbrand');calcTableHieght('excelRef')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
                 </div>
             </div>
             <!-- <div class="option-line">
@@ -114,7 +114,7 @@
                 </div>
                 <SelectBar style="margin: 20px 0" v-model="excelParam.content.where.actuatorname" :options="actuatorname" @change="Search('excelParam','actuatorname')"></SelectBar>
             </div>
-            <div class="tips" v-if="guangtouParam.content.where.drivetype=='电动'" style="color:#3874F6;margin-top: 10px;"><i class="el-icon-warning" style="margin-right: 5px;"></i>建议开关阀时间{{ caliber.filter(v=>v.value==guangtouParam.content.where.caliber).length ? caliber.filter(v=>v.value==guangtouParam.content.where.caliber)[0].remarks:'-' }}秒</div>
+            <div class="tips" v-if="guangtouParam.content.where.drivetype=='电动' && resultArr.length" style="color:#3874F6;margin-top: 10px;"><i class="el-icon-warning" style="margin-right: 5px;"></i>建议开关阀时间{{ caliber.filter(v=>v.value==resultArr[0].caliber).length ? caliber.filter(v=>v.value==resultArr[0].caliber)[0].remarks:'-' }}秒</div>
             <!--执行器-->
             <MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                 <template v-slot:customcol="scope">
@@ -168,7 +168,7 @@
                         </div>
                     </td>
                 </tr>
-                <tr>
+                <tr v-if="fujianArr.length">
                     <td class="title">辅件</td>
                     <td style="padding: 0;">
                         <tr style="border-bottom: 1px solid #DDDDDD;" class="custom-table">
@@ -498,7 +498,7 @@ export default {
                 let target = this.$refs[id].$el.getBoundingClientRect()
                 let clientHeight = document.body.clientHeight
                 this.tableHeight = clientHeight - target.top - 85 + 'px'
-                
+                this.$refs[id].$refs.table.doLayout()
             })
         },
         guangtouChange (val) {
@@ -957,7 +957,8 @@ export default {
         font-weight: bold;
         font-size: 16px;
         color: #333333;
-        padding: 34px 20px;
+        padding: 20px 20px;
+        min-width: 120px;
     }
     .custom-table {
         border: none;
@@ -988,6 +989,7 @@ export default {
     }
     .descript {
         display: flex;
+        flex-wrap: wrap;
     }
     .descript .item {
         font-family: Source Han Sans SC, Source Han Sans SC;
@@ -995,6 +997,7 @@ export default {
         font-size: 14px;
         color: #333333;
         margin-right: 40px;
+        margin-bottom: 5px;
     }
     .descript .item:last-child {
         margin-right: 0 !important;

src/optionSystem/valveOption/DieFa.vue

@@ -134,7 +134,7 @@
             <div class="option-line">
                 <div class="item">
                     <div class="label">品牌:</div>
-                    <MySelect @click="Search('excelParam','actuatorbrand')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
+                    <MySelect @click="Search('excelParam','actuatorbrand');calcTableHieght('excelRef')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
                 </div>
             </div>
             <!-- <div class="option-line">
@@ -167,7 +167,7 @@
                 </div>
                 <SelectBar style="margin: 20px 0" v-model="excelParam.content.where.actuatorname" :options="actuatorname" @change="Search('excelParam','actuatorname')"></SelectBar>
             </div>
-            <div class="tips" v-if="guangtouParam.content.where.drivetype=='电动'" style="color:#3874F6;margin-top: 10px;"><i class="el-icon-warning" style="margin-right: 5px;"></i>建议开关阀时间{{ caliber.filter(v=>v.value==guangtouParam.content.where.caliber).length ? caliber.filter(v=>v.value==guangtouParam.content.where.caliber)[0].remarks:'-' }}秒</div>
+            <div class="tips" v-if="guangtouParam.content.where.drivetype=='电动' && resultArr.length" style="color:#3874F6;margin-top: 10px;"><i class="el-icon-warning" style="margin-right: 5px;"></i>建议开关阀时间{{ caliber.filter(v=>v.value==resultArr[0].caliber).length ? caliber.filter(v=>v.value==resultArr[0].caliber)[0].remarks:'-' }}秒</div>
             <!--执行器-->
             <MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                 <template v-slot:customcol="scope">
@@ -221,7 +221,7 @@
                         </div>
                     </td>
                 </tr>
-                <tr>
+                <tr v-if="fujianArr.length">
                     <td class="title">辅件</td>
                     <td style="padding: 0;">
                         <tr style="border-bottom: 1px solid #DDDDDD;" class="custom-table">
@@ -431,7 +431,6 @@ export default {
                 this.active=1
                 this.resultArr=[]
                 this.fujianArr=[]
-                this.items.splice(2,1)
             } else if (type == '执行器') {
                 this.active=2
                 this.resultArr.splice(1)
@@ -562,6 +561,7 @@ export default {
                 let target = this.$refs[id].$el.getBoundingClientRect()
                 let clientHeight = document.body.clientHeight
                 this.tableHeight = clientHeight - target.top - 85 + 'px'
+                this.$refs[id].$refs.table.doLayout()
                 
             })
         },
@@ -972,13 +972,15 @@ export default {
     }
     .result{
         margin-top: 20px;
+        margin-bottom: 70px;
     }
     .result .title {
         font-family: Source Han Sans SC, Source Han Sans SC;
         font-weight: bold;
         font-size: 16px;
         color: #333333;
-        padding: 34px 20px;
+        padding: 20px 20px;
+        min-width: 120px;
     }
     .custom-table {
         border: none;
@@ -1009,6 +1011,7 @@ export default {
     }
     .descript {
         display: flex;
+        flex-wrap: wrap;
     }
     .descript .item {
         font-family: Source Han Sans SC, Source Han Sans SC;
@@ -1016,6 +1019,7 @@ export default {
         font-size: 14px;
         color: #333333;
         margin-right: 40px;
+        margin-bottom: 5px;
     }
     .descript .item:last-child {
         margin-right: 0 !important;