2024-08-26

src/optionSystem/FProductManage/modules/aside.vue

@@ -44,10 +44,10 @@
                 </div>
                 <div class="product-name">{{ resultArr[1] ? resultArr[1].actuatorname : '暂无' }}</div>
                 <div class="attrite" v-if="resultArr.length <= 2">
-                    {{ resultArr[1] ? `${resultArr[1].itemname}+${resultArr[1].gearboxname}`:'暂无' }}
+                    {{ resultArr[1] ? `${resultArr[1].actuatormodel}+${resultArr[1].gearboxname}`:'暂无' }}
                 </div>
                 <div class="attrite" v-else>
-                    {{ resultArr[1] ? `${resultArr[1].itemname}`:'暂无' }}
+                    {{ resultArr[1] ? `${resultArr[1].actuatormodel}`:'暂无' }}
                 </div>
                 <div class="attrite" v-if="resultArr[1] && resultArr[1].torque">
                     <div class="attrite-title">输出扭矩：</div>

src/optionSystem/FProductManage/modules/table.vue

@@ -6,7 +6,7 @@
             type="selection"
             width="35" fixed v-if="checkbox">
         </el-table-column>
-        <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName == col.columnname != -1?redirect ? redirect : 'right' :false : false">
+        <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName == col.columnname?redirect ? redirect : 'right' :false : false">
           <template v-slot:header="{ column,$index }" v-if="customHeader">
             <slot name="header" :data="column"></slot>
           </template>

src/optionSystem/executeManage/detail/index.vue

@@ -114,6 +114,10 @@ export default {
           label: "品牌",
           value: this.mainData.actuatorbrand,
         },
+        {
+          label: "系列",
+          value: this.mainData.actuatorseries,
+        },
         {
           label: "牌价",
           value: this.tool.formatAmount(this.mainData.marketprice,2),