修改bug

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

@@ -724,11 +724,11 @@
           if (!valid) {
             return false;
           }
-          this.form.tMainFactoryWorkstationOperationAddPOList =
-            this.$refs.stationMeter.getValue();
-          if (!this.form.tMainFactoryWorkstationOperationAddPOList.length) {
-            return this.$message.error('请添加工序');
-          }
+          // this.form.tMainFactoryWorkstationOperationAddPOList =
+          //   this.$refs.stationMeter.getValue();
+          // if (!this.form.tMainFactoryWorkstationOperationAddPOList.length) {
+          //   return this.$message.error('请添加工序');
+          // }
           this.loading = true;
 
           if (this.type != 'edit') {

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

@@ -42,6 +42,25 @@
           </el-select>
         </el-form-item>
       </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
+          <el-select
+            v-model="where.workCenterId"
+            filterable
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <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: 5, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
           <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
@@ -65,102 +84,110 @@
 </template>
 
 <script>
-import { getUserPage } from '@/api/system/organization';
-import AreaSelect from "@/views/enterpriseModel/regionalManage/components/area-cascader.vue";
-import {basicAreaPageAPI} from "@/api/regionalManage";
-export default {
-  components: {AreaSelect},
-  props: {
-    options_groupId: {
-      type: Array,
-      default() {
-        return [];
+  import { getUserPage } from '@/api/system/organization';
+  import AreaSelect from '@/views/enterpriseModel/regionalManage/components/area-cascader.vue';
+  import { basicAreaPageAPI } from '@/api/regionalManage';
+  import work from '@/api/technology/work';
+  export default {
+    components: { AreaSelect },
+    props: {
+      options_groupId: {
+        type: Array,
+        default() {
+          return [];
+        }
+      },
+      options_factory: {
+        type: Array,
+        default() {
+          return [];
+        }
       }
     },
-    options_factory: {
-      type: Array,
-      default() {
-        return [];
+    watch: {
+      options_groupId(nval) {
+        this.toTreeData(nval);
       }
-    }
-  },
-  watch: {
-    options_groupId(nval) {
-      this.toTreeData(nval);
-    }
-  },
-  data() {
-    // 默认表单数据
-    const defaultWhere = {
-      code: '',
-      name: '',
-      leaderId: ''
-    };
-    return {
-      defaultWhere,
-      // 表单数据
-      where: { ...defaultWhere },
-      options: {
-        groupId: [],
-        leaderId: []
-      },
-      areaTreeList:[]
-    };
-  },
-  computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
-    }
-  },
-  created() {
-    this.getUserPage();
-    this.getBasicAreaList();
-  },
-  methods: {
-    /* 获取区域集合 */
-    async getBasicAreaList() {
-      this.areaList = await basicAreaPageAPI(
-        {
-          pageNum: 1,
-          size: 9999
-        }
-      )
-      this.areaTreeList = this.$util.toTreeData({
-        data: this.areaList,
-        idField: 'id',
-        parentIdField: 'parentId'
-      });
-
     },
-    /* 搜索 */
-    search() {
-      this.$emit('search', this.where);
+    data() {
+      // 默认表单数据
+      const defaultWhere = {
+        code: '',
+        name: '',
+        leaderId: '',
+        workCenterId: ''
+      };
+      return {
+        defaultWhere,
+        // 表单数据
+        where: { ...defaultWhere },
+        options: {
+          groupId: [],
+          leaderId: []
+        },
+        workCenterList: [],
+        areaTreeList: []
+      };
     },
-    /*  重置 */
-    reset() {
-      console.log(this.defaultWhere);
-      this.where = { ...this.defaultWhere };
-      this.search();
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
     },
-    // 格式化公司数据
-    toTreeData(val) {
-      this.options.groupId = this.$util.toTreeData({
-        data: val,
-        idField: 'id',
-        parentIdField: 'parentId'
-      });
+    created() {
+      this.getUserPage();
+      this.getBasicAreaList();
+      this.getListWorkCenter();
     },
-    // 获取人员
-    getUserPage() {
-      let par = {
-        size: 999
-      };
-      getUserPage(par).then((res) => {
-        console.log(res);
-        this.options.leaderId = res.list;
-      });
+    methods: {
+      /* 获取区域集合 */
+      async getBasicAreaList() {
+        this.areaList = await basicAreaPageAPI({
+          pageNum: 1,
+          size: 9999
+        });
+        this.areaTreeList = this.$util.toTreeData({
+          data: this.areaList,
+          idField: 'id',
+          parentIdField: 'parentId'
+        });
+      },
+
+      async getListWorkCenter() {
+        await work.list({ pageNum: 1, size: -1 }).then((res) => {
+          this.workCenterList = res.list;
+        });
+      },
+
+      /* 搜索 */
+      search() {
+        this.$emit('search', this.where);
+      },
+      /*  重置 */
+      reset() {
+        console.log(this.defaultWhere);
+        this.where = { ...this.defaultWhere };
+        this.search();
+      },
+      // 格式化公司数据
+      toTreeData(val) {
+        this.options.groupId = this.$util.toTreeData({
+          data: val,
+          idField: 'id',
+          parentIdField: 'parentId'
+        });
+      },
+      // 获取人员
+      getUserPage() {
+        let par = {
+          size: 999
+        };
+        getUserPage(par).then((res) => {
+          console.log(res);
+          this.options.leaderId = res.list;
+        });
+      }
     }
-  }
-};
+  };
 </script>

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.125:18086',
         // 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.125:18086',
         // target: 'http://192.168.1.251:18186', // 测试环境
@@ -47,7 +47,7 @@ module.exports = {
         // target: 'http://192.168.1.11:18086', // 开发
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
-        target: 'http://f222326r53.imwork.net',
+        // target: 'http://f222326r53.imwork.net',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {