فهرست منبع

Merge branch '选型系统-成品管理,选好配置后,没有将驱动方式带入成品档案' into allTestUrgent

xiaohaizhao 7 ماه پیش
والد
کامیت
23a6cbb31a
1فایلهای تغییر یافته به همراه7 افزوده شده و 5 حذف شده
  1. 7 5
      src/optionSystem/FProductManage/modules/diefa/diefaAdd.vue

+ 7 - 5
src/optionSystem/FProductManage/modules/diefa/diefaAdd.vue

@@ -161,11 +161,11 @@
                             </div>
 
                             <div class="option-line" v-if="guangtouParam.content.where.drivetype=='气动'">
-                                                <div class="item">
-                                                    <div class="label">{{$t('驱动方式')}}:</div>
-                                                    <MySelect :isClear="false" :options="[{remarks:'气动调节',value:'气动调节'},{remarks:'气动开关',value:'气动开关'}]" v-model="excelParam.content.where.drivetype"></MySelect>
-                                                </div>
-                                            </div>
+                                <div class="item">
+                                    <div class="label">{{$t('驱动方式')}}:</div>
+                                    <MySelect :isClear="false" :options="[{remarks:'气动调节',value:'气动调节'},{remarks:'气动开关',value:'气动开关'}]" v-model="excelParam.content.where.drivetype"></MySelect>
+                                </div>
+                            </div>
 
                             <div class="option-line" v-if="guangtouParam.content.where.drivetype=='电动'">
                                 <div class="item">
@@ -299,6 +299,7 @@
                             <el-select multiple v-model="form.drivetype" :placeholder="$t(`请选择驱动方式`)" size="small" style="width:100%" disabled>
                                 <el-option v-for="item in drivetype" :key="item.value" :value="item.value" :label="item.remarks" disabled></el-option>
                             </el-select>
+                            <!-- <el-input type="text" autosize v-model="form.drivetype" disabled></el-input> -->
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -754,6 +755,7 @@ export default {
             this.resultArr[this.resultArr.length - 1] = data
         },
         writeForm () {
+            this.form.drivetype = [this.guangtouParam.content.where.drivetype]
             this.form.caliber = this.resultArr[0].caliber
             this.form.nominalpressure = this.resultArr[0].nominalpressure
             this.form.connection = this.resultArr[0].connection