55

src/views/factoryModel/station/components/edit.vue

@@ -40,14 +40,13 @@
           <el-col :span="8">
             <el-form-item label="工位类型:" prop="extInfo.type">
               <el-select
-                size="small"
                 class="ele-fluid"
                 v-model="form.extInfo.type"
               >
                 <el-option
                   label="设备"
                   :value="1"
-                  @click.native="form.extInfo.workTypeId = null"
+                  @click.native="form.extInfo.teamId = null"
                 />
                 <el-option
                   label="工位"
@@ -61,6 +60,8 @@
             </el-form-item>
           </el-col>
 
+          
+
           <el-col :span="8">
             <el-form-item
               label="设备编码:"
@@ -75,6 +76,8 @@
             </el-form-item>
           </el-col>
 
+
+
           <el-col :span="8">
             <el-form-item
               label="设备名称:"
@@ -85,21 +88,31 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="8">
             <el-form-item
-              label="员工工号:"
-              prop="extInfo.workTypeId"
+              label="班组:"
+              prop="extInfo.teamId"
+
               v-if="form.extInfo.type == 3"
             >
-              <DictSelection
-                dictName="工种"
+              <el-select
+                            style="width: 100%"
+                v-model="form.extInfo.teamId"
                 clearable
-                filterable
-                v-model="form.extInfo.workTypeId"
+                :filterable="true"
               >
-              </DictSelection>
+                <el-option
+                  v-for="item in teamPagerList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
+
+   
           <el-col :span="8">
             <el-form-item label="所属区域:" prop="location_city">
               <area-select
@@ -362,6 +375,9 @@
   import { listOrganizations } from '@/api/system/organization';
 
   import { getFactoryarea } from '@/api/factoryModel';
+
+  import { getteampage } from '@/api/workforceManagement/team';
+
   export default {
     components: {
       AreaSelect,
@@ -396,7 +412,7 @@
             workCenterId: null, //所属工作中心
             produceId: null, //可执行工序
             type: null,
-            workTypeId: null
+            teamId: null
           },
           id: '',
           leaderId: '', // 负责人
@@ -417,6 +433,8 @@
         workshopPlanList: [],
         areaTreeList: [],
 
+        teamPagerList: [],
+
         // 表单验证规则
         rules: {
           code: [{ required: true, message: '请输入', trigger: 'blur' }],
@@ -527,6 +545,7 @@
       this.getGs();
       this.getFactoryList();
       this.getBasicAreaList();
+      this.getteampagerList();
     },
     methods: {
       chooseAsset() {
@@ -597,6 +616,16 @@
         this.getListProduce();
       },
 
+      getteampagerList() {
+        let param = {
+          pageNum: 1,
+          size: -1
+        };
+        getteampage(param).then((res) => {
+          this.teamPagerList = res.list || [];
+        });
+      },
+
       async getFactoryList() {
         const { list } = await getFactoryarea({
           pageNum: 1,

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
-        target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {