Merge branch 'mergeBranch' into orangeUrgent

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

@@ -26,8 +26,8 @@
                     <span>{{ resultArr[1] && resultArr[1].model }} {{resultArr.length == 3 ? ` + ${$t('减速箱')}：${resultArr[2] && resultArr[2].itemname}` : '' }}</span>
                 </div>
                 <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].actuatortype"><span style="color: #888888;">{{$t('执行器类型')}}：</span>{{resultArr[1].actuatortype }}</div>
+                    <!-- <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].actuatortype"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].actuatortype }}</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>

src/optionSystem/selectOption/components/DieFa.vue

@@ -755,7 +755,7 @@
           >{{ $t(position == "单独选型" ? "保存选型单" : "确认添加") }}</el-button
         >
       </div>
-    </div>Fsearch
+    </div>
   </div>
 </template>
 
@@ -1141,7 +1141,7 @@ export default {
       }
     },
     async onSubmit() {
-      this.$confirm(this.$t("确认加入单据吗") + "?", this.$t("提示"), {
+      this.$confirm(this.$t(this.position == '单独选型' ? '是否确认保存':"确认加入单据吗") + "?", this.$t("提示"), {
         confirmButtonText: this.$t("确定"),
         cancelButtonText: this.$t("取消"),
         type: "warning",