选型优化

src/optionSystem/FProductManage/modules/diefa/diefaAdd.vue

@@ -70,13 +70,13 @@
                                 <div class="option-line">
                                     <div class="item">
                                         <div class="label">公称通径:</div>
-                                        <el-select v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
+                                        <el-select filterable v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
                                             <el-option v-for="item in caliber" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                         </el-select>
                                     </div>
                                     <div class="item">
                                         <div class="label">公称压力:</div>
-                                        <el-select @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
+                                        <el-select filterable @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
                                             <el-option v-for="item in nominalpressure" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                         </el-select>
                                     </div>
@@ -92,19 +92,19 @@
                                 <div class="option-line">
                                     <div class="item">
                                         <div class="label">阀体材质:</div>
-                                        <el-select @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
+                                        <el-select filterable @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
                                             <el-option v-for="item in bodymaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                         </el-select>
                                     </div>
                                     <div class="item">
                                         <div class="label">阀杆材质:</div>
-                                        <el-select @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
+                                        <el-select filterable @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
                                             <el-option v-for="item in stemmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                         </el-select>
                                     </div>
                                     <div class="item">
                                         <div class="label">阀座材质:</div>
-                                        <el-select @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
+                                        <el-select filterable @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
                                             <el-option v-for="item in plinthmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                         </el-select>
                                     </div>

src/optionSystem/FProductManage/modules/diefa/edit.vue

@@ -70,13 +70,13 @@
                                     <div class="option-line">
                                         <div class="item">
                                             <div class="label">公称通径:</div>
-                                            <el-select v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
+                                            <el-select filterable v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
                                                 <el-option v-for="item in caliber" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                             </el-select>
                                         </div>
                                         <div class="item">
                                             <div class="label">公称压力:</div>
-                                            <el-select @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
+                                            <el-select filterable @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
                                                 <el-option v-for="item in nominalpressure" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                             </el-select>
                                         </div>
@@ -92,19 +92,19 @@
                                     <div class="option-line">
                                         <div class="item">
                                             <div class="label">阀体材质:</div>
-                                            <el-select @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
+                                            <el-select filterable @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
                                                 <el-option v-for="item in bodymaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                             </el-select>
                                         </div>
                                         <div class="item">
                                             <div class="label">阀杆材质:</div>
-                                            <el-select @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
+                                            <el-select filterable @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
                                                 <el-option v-for="item in stemmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                             </el-select>
                                         </div>
                                         <div class="item">
                                             <div class="label">阀座材质:</div>
-                                            <el-select @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
+                                            <el-select filterable @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
                                                 <el-option v-for="item in plinthmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                                             </el-select>
                                         </div>

src/optionSystem/optionOrder/detail/modules/components/DieFa.vue

@@ -20,13 +20,13 @@
                 <div class="option-line">
                     <div class="item">
                         <div class="label">公称通径:</div>
-                        <el-select v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
+                        <el-select filterable v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
                             <el-option v-for="item in caliber" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
                     <div class="item">
                         <div class="label">公称压力:</div>
-                        <el-select @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
                             <el-option v-for="item in nominalpressure" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
@@ -42,19 +42,19 @@
                 <div class="option-line">
                     <div class="item">
                         <div class="label">阀体材质:</div>
-                        <el-select @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
                             <el-option v-for="item in bodymaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
                     <div class="item">
                         <div class="label">阀杆材质:</div>
-                        <el-select @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
                             <el-option v-for="item in stemmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
                     <div class="item">
                         <div class="label">阀座材质:</div>
-                        <el-select @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
                             <el-option v-for="item in plinthmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>

src/optionSystem/selectOption/add copy.vue

@@ -0,0 +1,93 @@
+<template>
+    <div style="display: inline;">
+      <el-dropdown @command="onShow">
+        <el-button type="primary" size="small"> 阀门选型 </el-button>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item :command="item.value" v-for="item in valvetypeList" :key="item.value">{{ item.remarks }}</el-dropdown-item>
+        </el-dropdown-menu>
+        </el-dropdown>
+        <el-dialog custom-class="custom-select-option_class" :visible.sync="drawer" width="1100px" append-to-body :show-close="false">
+            <component :position="position" @close="drawer=false" :is="formComponent" v-on="$listeners"></component>
+        </el-dialog>
+    </div>
+  </template>
+    
+<script>
+import { mapGetters } from "vuex";
+export default {
+    props:['position'],
+    data() {
+        return {
+        drawer: false,
+        type: "",
+        valvetypeList:[]
+        };
+    },
+    provide () {
+        return {
+        valvetype:() => this.type
+        }
+    },
+    computed: {
+        ...mapGetters({
+        loading: "loading",
+    }),
+
+    formComponent() {
+        switch (this.type) {
+            case "蝶阀":
+            return () =>
+                import("@/optionSystem/selectOption/components/DieFa.vue");
+            break;
+            default:
+            break;
+        }
+    },
+},
+methods: {
+    onShow(type) {
+    this.type = type;
+    this.drawer = true;
+    },
+    onSubmit() {
+        this.$refs.target.$refs['form'].validate(async (valid) => {
+            if (!valid) return false
+            this.$refs.target.onSubmit(() => {
+            this.$refs.target.refresh()
+            this.drawer = false
+            })
+        });
+    },
+optionList() {
+    this.$store.dispatch("optiontypeselect", "valvetype").then((res) => {
+        this.valvetypeList = res.data;
+        console.log(this.valvetypeList, "阀门类型");
+    });
+},
+},
+created () {
+    this.optionList()
+}
+};
+</script>
+<style scoped>
+.dialog-footer {
+    margin-top: 32px;
+    text-align: center;
+}
+/deep/.el-dialog__header {
+    display: none !important;
+}
+/deep/.el-dialog__body {
+    padding-top: 0 !important;
+}
+</style>
+<style>
+@media screen and (max-width:1800px) {
+    .custom-select-option_class.el-dialog {
+        margin-top: 10px !important;
+    }
+}
+
+</style>
+    

src/optionSystem/selectOption/add.vue

@@ -1,11 +1,6 @@
 <template>
     <div style="display: inline;">
-      <el-dropdown @command="onShow">
-        <el-button type="primary" size="small"> 阀门选型 </el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item :command="item.value" v-for="item in valvetypeList" :key="item.value">{{ item.remarks }}</el-dropdown-item>
-        </el-dropdown-menu>
-        </el-dropdown>
+        <el-button type="primary" size="small" @click="drawer=true"> 阀门选型 </el-button>
         <el-dialog custom-class="custom-select-option_class" :visible.sync="drawer" width="1100px" append-to-body :show-close="false">
             <component :position="position" @close="drawer=false" :is="formComponent" v-on="$listeners"></component>
         </el-dialog>
@@ -19,7 +14,7 @@ export default {
     data() {
         return {
         drawer: false,
-        type: "",
+        type: "蝶阀",
         valvetypeList:[]
         };
     },
@@ -34,14 +29,7 @@ export default {
     }),
 
     formComponent() {
-        switch (this.type) {
-            case "蝶阀":
-            return () =>
-                import("@/optionSystem/selectOption/components/DieFa.vue");
-            break;
-            default:
-            break;
-        }
+        return () => import("@/optionSystem/selectOption/components/DieFa.vue");
     },
 },
 methods: {

src/optionSystem/selectOption/components/DieFa.vue

@@ -6,13 +6,13 @@
                 <div class="option-line">
                     <div class="item">
                         <div class="label">公称通径:</div>
-                        <el-select v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
+                        <el-select filterable v-model="guangtouParam.content.where.caliber" placeholder="请选择公称通径" size="small" style="width:100%" clearable @change="Search('guangtouParam','caliber')">
                             <el-option v-for="item in caliber" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
                     <div class="item">
                         <div class="label">公称压力:</div>
-                        <el-select @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','nominalpressure')" :disabled="!guangtouParam.content.where.caliber" v-model="guangtouParam.content.where.nominalpressure" placeholder="请选择公称压力" size="small" style="width:100%" clearable>
                             <el-option v-for="item in nominalpressure" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
@@ -28,19 +28,19 @@
                 <div class="option-line">
                     <div class="item">
                         <div class="label">阀体材质:</div>
-                        <el-select @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','bodymaterial')" :disabled="!guangtouParam.content.where.connection" v-model="guangtouParam.content.where.bodymaterial" placeholder="请选择阀体材质" size="small" style="width:100%" clearable>
                             <el-option v-for="item in bodymaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
                     <div class="item">
                         <div class="label">阀杆材质:</div>
-                        <el-select @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','stemmaterial')" :disabled="!guangtouParam.content.where.bodymaterial" v-model="guangtouParam.content.where.stemmaterial" placeholder="请选择阀杆材质" size="small" style="width:100%" clearable>
                             <el-option v-for="item in stemmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
                     <div class="item">
                         <div class="label">阀座材质:</div>
-                        <el-select @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
+                        <el-select filterable @change="Search('guangtouParam','plinthmaterial')" :disabled="!guangtouParam.content.where.stemmaterial" v-model="guangtouParam.content.where.plinthmaterial" placeholder="请选择阀座材质" size="small" style="width:100%" clearable>
                             <el-option v-for="item in plinthmaterial" :key="item.value" :value="item.value" :label="item.remarks"></el-option>
                         </el-select>
                     </div>
@@ -84,32 +84,6 @@
                     </div>
                 </div>
 
-                <div class="option-line">
-                    <div class="item">
-                        <div class="label">执行器:</div>
-                        <el-input
-                            placeholder="型号/料号"
-                            v-model="excelParam.content.where.condition1"
-                            clearable
-                            @clear="Search('excelParam')"
-                            size="small"
-                            @keyup.enter.native="Search('excelParam')">
-                        </el-input>
-                    </div>
-
-                    <div class="item" v-if="guangtouParam.content.where.drivetype!='气动'">
-                        <div class="label">减速箱:</div>
-                        <el-input
-                            placeholder="型号/料号"
-                            v-model="excelParam.content.where.condition2"
-                            clearable
-                            @clear="Search('excelParam')"
-                            size="small"
-                            @keyup.enter.native="Search('excelParam')">
-                        </el-input>
-                    </div>
-                </div>
-
                 <div class="option-line" v-if="guangtouParam.content.where.drivetype=='气动'">
                     <div class="item">
                         <div class="label">驱动方式:</div>
@@ -216,7 +190,7 @@
                 </div>
                 <MyTable height="400" ref="resultTable" :layout="tool.tabelCol($route.name)['reslutList'].tablecols" :data="resultArr" :opwidth="200" :custom="true" style="margin-top: 25px">
                     <template v-slot:customcol="scope">
-                        <p v-if="scope.column.columnname == 'model'">{{ scope.column.data.actuatormodel }}/{{ scope.column.data.spec }}</p>
+                        <p v-if="scope.column.columnname == 'model'">{{ scope.column.data.actuatormodel }}</p>
                         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
                     </template>
                 </MyTable>
@@ -523,7 +497,7 @@ export default {
             }
         },
         async onSubmit () {
-            this.$confirm('确认提交数据吗?', '提示', {
+            this.$confirm('确认加入单据吗?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'