优化

src/api/produceWord/index.js

@@ -23,3 +23,17 @@ export async function releaseWorkOrder({ id, teamId }) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+
+// 列表
+export async function getteampage(data) {
+  const res = await request.get(`/main/team/page`, {
+      params: data
+  });
+  console.log(res.data.code == 0)
+  if (res.data.code == 0) {
+      return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/produceOrder/components/produceOrder-search.vue

@@ -90,6 +90,16 @@
           </el-select>
         </el-form-item>
       </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="班组:">
+          <el-select v-model="where.teamId" placeholder="请选择" style="width: 100%" >
+            <el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
       <el-col v-bind="styleResponsive ? { lg: 9, md: 12 } : { span: 9 }">
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -125,6 +135,7 @@
 </template>
 
 <script>
+import { getteampage } from  '@/api/produceWord/index.js';
   export default {
     props: ['activeName', 'statusOpt', 'planType'],
     data() {
@@ -138,14 +149,19 @@
         brandNo: '',
         model: '',
         planType: null,
-        createTime: []
+        createTime: [],
+        teamId: '',
       };
       return {
         // 表单数据
         deliveryVal: 'deliveryTime',
         shapeVal: 'reqMoldTime',
         where: { ...defaultWhere },
-        treeData: []
+        treeData: [],
+        teamList: []
+
+
+
       };
     },
     computed: {
@@ -165,7 +181,9 @@
         immediate: true
       }
     },
-    created() {},
+    created() {
+      this.getteampage()
+    },
     methods: {
       /* 搜索 */
       search() {
@@ -185,7 +203,14 @@
       reset() {
         this.where = { ...this.defaultWhere };
         this.search();
-      }
+      },
+
+      
+      getteampage() {
+      getteampage().then((res) => {
+        this.teamList = res.list;
+      });
+    }
     }
   };
 </script>

src/views/produceOrder/index.vue

@@ -181,7 +181,7 @@
           },
           {
             slot: 'code',
-            label: '生产工单号',
+            label: '生产订单号',
             align: 'center',
             minWidth: 110
           },

src/views/produceWord/components/order-search.vue

@@ -59,6 +59,19 @@
           <el-input clearable v-model="where.model" placeholder="请输入" />
         </el-form-item>
       </el-col>
+
+      
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="班组:">
+          <el-select v-model="where.teamId" placeholder="请选择" style="width: 100%" >
+            <el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+
       <el-col v-bind="styleResponsive ? { lg: 9, md: 12 } : { span: 9 }">
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -94,6 +107,7 @@
 </template>
 
 <script>
+import { getteampage } from  '@/api/produceWord/index.js';
   export default {
     props: [  ],
     data () {
@@ -106,13 +120,16 @@
         productName: '',
         brandNo: '',
         model: '',
-        type: 'mes',
-        createTime: []
+        createTime: [],
+        statusList: [4,5,6,7],
+        teamId: ''
       };
       return {
         // 表单数据
         where: { ...defaultWhere },
 
+        teamList: []
+
       };
     },
     computed: {
@@ -122,7 +139,9 @@
       }
     },
     watch: { },
-    created () {},
+    created () {
+      this.getteampage()
+    },
     methods: {
       /* 搜索 */
       search () {
@@ -138,7 +157,13 @@
       reset () {
         this.where = { ...this.defaultWhere };
         this.search();
-      }
+      },
+
+      getteampage() {
+      getteampage().then((res) => {
+        this.teamList = res.list;
+      });
+    }
     }
   };
 </script>

src/views/produceWord/index.vue

@@ -20,18 +20,8 @@
             {{ statusFormatter(row.status) }}
           </span>
         </template>
-        <!-- 操作列 -->
-        <template v-slot:action="{ row }">
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-truck"
-            @click="toRelease(row)"
-            v-if="row.status == 8"
-          >
-            下达
-          </el-link>
-        </template>
+ 
+
       </ele-pro-table>
     </el-card>
 
@@ -74,6 +64,8 @@
         statusOpt: [
           { label: '待生产', value: 4 },
           { label: '生产中', value: 5 },
+          { label: '已完成', value: 6 },
+          { label: '已延期', value: 7 },
           { label: '待下达', value: 8 }
         ]
       };
@@ -93,7 +85,7 @@
           },
           {
             slot: 'code',
-            label: '生产工单号',
+            label: '生产订单号',
             align: 'center',
             minWidth: 110
           },
@@ -164,16 +156,24 @@
               return obj && obj.label;
             }
           },
+
           {
-            columnKey: 'action',
-            label: '操作',
-            width: 90,
+            prop: 'teamName',
+            label: '班组',
             align: 'center',
-            resizable: false,
-            fixed: 'right',
-            slot: 'action',
-            showOverflowTooltip: true
-          }
+            showOverflowTooltip: true,
+          },
+
+          // {
+          //   columnKey: 'action',
+          //   label: '操作',
+          //   width: 90,
+          //   align: 'center',
+          //   resizable: false,
+          //   fixed: 'right',
+          //   slot: 'action',
+          //   showOverflowTooltip: true
+          // }
         ];
       }
     },

vue.config.js

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