|
|
@@ -226,7 +226,7 @@
|
|
|
<MySelect :disabled="!excelParam.content.where.func" @click="Search('excelParam','bodystructure')" :options="bodystructure" v-model="excelParam.content.where.bodystructure"></MySelect>
|
|
|
</div>
|
|
|
</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>
|
|
|
+ <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.split(';')[0]:'-' }}秒</div>
|
|
|
<!--执行器-->
|
|
|
<div v-if="guangtouParam.content.where.drivetype=='电动'">
|
|
|
<MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :layout="tool.tabelCol($route.name)['excelTable1'].tablecols" :param="excelParam" :custom="true" style="margin-top: 14px">
|
|
|
@@ -340,9 +340,16 @@
|
|
|
<td class="title">成品料号</td>
|
|
|
<td class="text1">{{ Object.keys(product).length ? product.itemno||'-' : '' }}</td>
|
|
|
</tr>
|
|
|
+
|
|
|
<tr>
|
|
|
- <td class="title">{{product.itemno?'牌价':'预估价格'}}</td>
|
|
|
- <td class="text2">￥{{ Object.keys(product).length ? tool.formatAmount(product.price,2) : 'xxxxxx' }}</td>
|
|
|
+ <td class="title" style="padding: 0" colspan="2">
|
|
|
+ <tr class="price-tr">
|
|
|
+ <td class="title" style="width: 120px !important;">{{product.itemno?'牌价':'预估价格'}}</td>
|
|
|
+ <td class="text2">￥{{ Object.keys(product).length ? tool.formatAmount(product.price,2) : 'xxxxxx' }}</td>
|
|
|
+ <td class="title">成本价格</td>
|
|
|
+ <td class="text2">￥{{ Object.keys(product).length ? tool.formatAmount(product.marketprice,2) : 'xxxxxx' }}</td>
|
|
|
+ </tr>
|
|
|
+ </td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
|
@@ -1157,4 +1164,16 @@ export default {
|
|
|
color: #E80000;
|
|
|
}
|
|
|
|
|
|
+ .price-tr {
|
|
|
+ display: flex;
|
|
|
+ }
|
|
|
+ .price-tr td ~ td {
|
|
|
+ flex: 1;
|
|
|
+ }
|
|
|
+ .price-tr td {
|
|
|
+ border-left: none;
|
|
|
+ border-top: none;
|
|
|
+ border-bottom: none;
|
|
|
+ }
|
|
|
+
|
|
|
</style>
|
