ysy пре 2 година
родитељ
комит
a26bfcfc6a

+ 17 - 18
src/views/technology/route/components/user-edit.vue

@@ -26,15 +26,14 @@
         </el-col>
 
         <el-col :span="8">
-                        <el-form-item label="生产版本:" prop="produceVersionId">
-                            <el-select v-model="form.produceVersionId" filterable placeholder="请选择" 
-                                :style="{ width: '100%' }">
-                                <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
-                                    :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+          <el-form-item label="生产版本:" prop="produceVersionId">
+            <el-select v-model="form.produceVersionId" filterable placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
 
         <el-col :span="8">
@@ -51,7 +50,7 @@
           </el-form-item>
         </el-col>
 
-        
+
       </el-row>
     </el-form>
 
@@ -73,7 +72,7 @@ import { pageList } from '@/api/technology/version/version.js';
 
 export default {
   components: {
-  
+
   },
   props: {
     // 弹窗是否打开
@@ -178,13 +177,13 @@ export default {
     },
 
     async getVersionList() {
-            const res = await pageList({
-                pageNum: 1,
-                size: 100
-            });
+      const res = await pageList({
+        pageNum: 1,
+        size: 100
+      });
 
-            this.versionList = res.list;
-        },
+      this.versionList = res.list;
+    },
 
     /* 更新visible */
     updateVisible(value) {
@@ -194,7 +193,7 @@ export default {
 
   watch: {
     async visible(visible) {
-      
+
       if (visible) {
         this.getVersionList()
         const res = await route.Flist({

+ 27 - 11
src/views/technology/route/components/user-search.vue

@@ -17,16 +17,15 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-<!--      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="生产版本:">
-          <el-input
-            clearable
-            disabled
-            v-model="where.version"
-            placeholder="请输入"
-          />
+          <el-select v-model="where.produceVersionId" filterable placeholder="请选择" :style="{ width: '100%' }">
+              <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
         </el-form-item>
-      </el-col> -->
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="状态:" label-width="70px">
           <el-select v-model="where.status" filterable placeholder="请选择">
@@ -59,13 +58,15 @@
 </template>
 
 <script>
+import { pageList } from '@/api/technology/version/version.js';
   export default {
     data() {
       // 默认表单数据
       const defaultWhere = {
         code: '',
         name: '',
-        status: 1
+        status: 1,
+        produceVersionId: ''
       };
       return {
         // 表单数据
@@ -74,9 +75,15 @@
           { label: '草稿', value: -1 },
           { label: '失效', value: 0 },
           { label: '生效', value: 1 }
-        ]
+        ],
+
+        versionList: [],
       };
     },
+
+    created() {
+      this.getVersionList()
+    },
     computed: {
       // 是否开启响应式布局
       styleResponsive() {
@@ -92,7 +99,16 @@
       reset() {
         this.where = { ...this.defaultWhere }
         this.search();
-      }
+      },
+
+      async getVersionList() {
+      const res = await pageList({
+        pageNum: 1,
+        size: 100
+      });
+
+      this.versionList = res.list;
+    },
     }
   };
 </script>