Merge branch '选型bug' into allTestUrgent

src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -28,7 +28,7 @@
                 <div class="descript">
                     <!-- <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].actuatorname }}</div> -->
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].itemno"><span style="color: #888888;">{{$t('执行器料号')}}：</span>{{resultArr[1].itemno }}</div>
-                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatortype"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].actuatortype }}</div>
+                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].itemname"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].itemname }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].bodystructure"><span style="color: #888888;">{{$t('执行器结构')}}：</span>{{resultArr[1].bodystructure }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">{{$t('输出扭矩')}}：</span>{{resultArr[1].torque }}(Nm)</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">{{$t('转速')}}：</span>{{resultArr[1].speed }}(rpm)</div>