Merge branch 'project9-8' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project9-8

src/views/production/gxlog/index.vue

@@ -39,14 +39,20 @@
         />
       </el-form-item>
       <el-form-item label="gx" prop="gx">
-        <el-input
+        <el-select
           v-model="queryParams.gx"
-          placeholder="请输入gx"
+          placeholder="请选择gx"
           clearable
           size="small"
           style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="dict in dictList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button