瀏覽代碼

新增班组管理工作中心搜索

695593266@qq.com 7 月之前
父節點
當前提交
19fdcd4b82
共有 2 個文件被更改,包括 38 次插入8 次删除
  1. 36 6
      src/views/workforceManagement/team/components/search.vue
  2. 2 2
      vue.config.js

+ 36 - 6
src/views/workforceManagement/team/components/search.vue

@@ -7,12 +7,12 @@
     @submit.native.prevent
     @submit.native.prevent
   >
   >
     <el-row>
     <el-row>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="名称:">
         <el-form-item label="名称:">
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="所属工厂:">
         <el-form-item label="所属工厂:">
           <el-select
           <el-select
             style="width: 100%"
             style="width: 100%"
@@ -32,7 +32,7 @@
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
 
 
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
         <el-form-item label="所属厂房:">
         <el-form-item label="所属厂房:">
           <el-select
           <el-select
             style="width: 100%"
             style="width: 100%"
@@ -51,7 +51,27 @@
         </el-form-item>
         </el-form-item>
       </el-col>
       </el-col>
 
 
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
+        <el-form-item label="工作中心:">
+          <el-select
+            style="width: 100%"
+            clearable
+            v-model="where.workCenterId"
+            filterable
+            placeholder="请选择工作中心"
+          >
+            <el-option
+              v-for="item in workCenterList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 3, md: 6 } : { span: 3 }">
         <div class="ele-form-actions">
         <div class="ele-form-actions">
           <el-button
           <el-button
             type="primary"
             type="primary"
@@ -70,25 +90,29 @@
 
 
 <script>
 <script>
   import { getFactoryarea } from '@/api/factoryModel';
   import { getFactoryarea } from '@/api/factoryModel';
+  import work from '@/api/technology/work';
   export default {
   export default {
     data() {
     data() {
       // 默认表单数据
       // 默认表单数据
       const defaultWhere = {
       const defaultWhere = {
         name: '',
         name: '',
         factoryId: '',
         factoryId: '',
-        workshopPlanId: ''
+        workshopPlanId: '',
+        workCenterId: ''
       };
       };
       return {
       return {
         // 表单数据
         // 表单数据
         where: { ...defaultWhere },
         where: { ...defaultWhere },
 
 
         factoryList: [],
         factoryList: [],
-        workshopPlanList: []
+        workshopPlanList: [],
+        workCenterList: []
       };
       };
     },
     },
 
 
     created() {
     created() {
       this.getFactoryList();
       this.getFactoryList();
+      this.getListWorkCenter();
     },
     },
     computed: {
     computed: {
       // 是否开启响应式布局
       // 是否开启响应式布局
@@ -121,6 +145,12 @@
         });
         });
       },
       },
 
 
+      async getListWorkCenter() {
+        await work.list({ pageNum: 1, size: -1 }).then((res) => {
+          this.workCenterList = res.list;
+        });
+      },
+
       /* 搜索 */
       /* 搜索 */
       search() {
       search() {
         this.$emit('search', this.where);
         this.$emit('search', this.where);

+ 2 - 2
vue.config.js

@@ -37,14 +37,14 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18186',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
 
 
         // target: 'http://192.168.1.11:18086', // 开发
         // target: 'http://192.168.1.11:18086', // 开发
-        target: 'http://192.168.1.116:18086', // 赵沙金
+        // target: 'http://192.168.1.116:18086', // 赵沙金
 
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
         pathRewrite: {