生产工单列表

src/api/workOrder/index.js

@@ -6,8 +6,17 @@ import Vue from 'vue';
 /**
  * 列表
  */
-export async function getList (data) {
-  const res = await request.get('/aps/workorder/page', {data});
+export async function getList (params) {
+  const res = await request.post('/aps/workorder/page', params);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 下达
+export async function releaseWorkOrder(id) {
+  const res = await request.get(`/aps/workorder/releaseWorkOrder/${id}`);
   if (res.data.code == 0) {
     return res.data.data;
   }

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

@@ -47,16 +47,6 @@
             placeholder="请输入"
           />
         </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="牌号:">
-          <el-input clearable v-model="where.brandNo" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="型号:">
-          <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="状态:">
@@ -70,6 +60,16 @@
 	      </el-select>
 	    </el-form-item>
 	  </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="牌号:">
+          <el-input clearable v-model="where.brandNo" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="型号:">
+          <el-input clearable v-model="where.model" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 9, md: 12 } : { span: 9 }">
         <el-form-item label="创建时间:">
           <el-date-picker
@@ -124,9 +124,9 @@
         // 表单数据
         where: { ...defaultWhere },
 		statusOpt: [
-			 { label: '待下达', value: '8' },
-		    { label: '待生产', value: '4' },
-		    { label: '生产中', value: '5' }
+			{ label: '待下达', value: 8 },
+		    { label: '待生产', value: 4 },
+		    { label: '生产中', value: 5 }
 		],
       };
     },
@@ -142,15 +142,11 @@
       /* 搜索 */
       search () {
         const where = { ...this.where };
-
         if (where.createTime?.length) {
           where.createTimeStart = where.createTime[0];
           where.createTimeEnd = where.createTime[1];
         }
         delete where.createTime;
-
-        // where.status = where.status.split(',');
-
         this.$emit('search', where);
       },
       /*  重置 */

src/views/workOrder/index.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-  import { getList } from '@/api/workOrder/index.js';
+  import { getList , releaseWorkOrder } from '@/api/workOrder/index.js';
   import OrderSearch from './components/order-search.vue';
   export default {
     components: {
@@ -55,9 +55,9 @@
       return {
 		loading:false,
         statusOpt: [
-            { label: '待生产', value: '4' },
-            { label: '生产中', value: '5' },
-            { label: '待下达', value: '8' }
+            { label: '待生产', value: 4 },
+            { label: '生产中', value: 5 },
+            { label: '待下达', value: 8 }
         ],
       };
     },
@@ -171,6 +171,10 @@
       },
       /* 表格数据源 */
       datasource({ page, limit, where }) {
+		if(where.status){
+			where.statusList = []
+			where.statusList.push(where.status)
+		}
         return getList({
           pageNum: page,
           size: limit,
@@ -179,13 +183,15 @@
       },
       // 下达
       toRelease(row) {
-        // cancelCompletion([row.id]).then((res) => {
-        //   this.$message.success('成功');
-        //   this.reload();
-        // });
+        releaseWorkOrder(row.id).then((res) => {
+			if(res){
+				this.$message.success('成功');
+				this.reload();
+			}
+        });
       },
       /* 刷新表格 */
-      reload(where = {}) {
+      reload(where) {
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });