ysy před 2 roky
rodič
revize
866bf16cc6

+ 1 - 1
src/views/workforceManagement/team/components/edit.vue

@@ -264,7 +264,7 @@ export default {
     },
     // 获取产线
     getlistFactoryLineByParentId() {
-      return listFactoryLine( this.form.workshopId).then((res) => {
+      return listFactoryLine(this.form.workshopId).then((res) => {
         this.options.productionLineId = res.map((n) => {
           return {
             value: n.id,

+ 4 - 4
src/views/workforceManagement/team/components/staffSelection.vue

@@ -35,7 +35,7 @@
         <el-col :span="9" class="zw-page-main">
           <el-card>
             <div class="zw-card-header" slot="header">
-              <span class="zw-header-title details-title">员工明细</span>
+              <span class="zw-header-title details-title">员工明细 </span>
             </div>
             <div class="zw-page-main-list">
               <el-container class="zw-container">
@@ -204,13 +204,13 @@ export default {
         }
       });
       this.staffList = [...this.staffList, ...list];
-      this.pageNum = res.pageNum;
+      // this.pageNum = res.pageNum;
     },
     //查询更多员工
     async getMore() {
-      this.pageNum += 1;
+      this.pageNum = this.pageNum + 1;
       let params = {
-        pageNum: 1,
+        pageNum:this.pageNum,
         size: this.size,
         groupId: this.form.groupId
       };

+ 2 - 2
vue.config.js

@@ -32,8 +32,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.139:18086',
+        target: 'http://124.71.68.31:50001',
+        // target: 'http://192.168.1.139:18086',
         // target: 'http://192.168.1.132:18086',
               // target: 'http://124.71.21.222:50001',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域