66

src/views/produce/components/picking/details.vue

@@ -12,7 +12,7 @@
       @refresh="refresh"
     >
       <template v-slot:toolbar>
-        <div class="c_title">领料详情 </div>
+        <div class="c_title">领料记录 </div>
       </template>
 
       <template v-slot:action="{ row }">

src/views/produce/components/produceOrder.vue

@@ -14,7 +14,19 @@
       :need-page="false"
     >
       <template v-slot:toolbar>
-        <div class="c_title">工单列表 </div>
+        <div class="rx-bc">
+          <div class="c_title">工单列表 </div>
+
+          <div>
+            <el-input
+              style="width: 180px"
+              clearable
+              v-model="workOrderCode"
+              placeholder="请输入工单号"
+            />
+            <el-button  size="mini" type="primary" style="margin: 0 5px" @click="handleSearch">查询</el-button>
+          </div>
+        </div>
       </template>
 
       <template v-slot:code="{ row }">
@@ -58,6 +70,8 @@
         routeObj: {},
         routingShow: false,
 
+        workOrderCode: '',
+
         internalIsFullscreen: isFullscreen() // 初始值
       };
     },
@@ -93,26 +107,18 @@
             align: 'center',
             minWidth: '110'
           },
-          {
-            prop: '',
-            label: '计划编号',
-            align: 'center'
-          },
-          {
-            prop: '',
-            label: '计划类型',
-            align: 'center'
-          },
 
           {
             prop: 'productCode',
             label: '产品编码',
-            align: 'center'
+            align: 'center',
+        
           },
           {
             prop: 'productName',
             label: '产品名称',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true,
           },
 
           {
@@ -233,13 +239,20 @@
       datasource({ page, where }) {
         return workorderPage2({
           pageNum: page,
-          size: 200,
-          workOrderId: this.$route.query.workOrderId  ? this.$route.query.workOrderId : null,
+          size: 500,
+          workOrderId: this.$route.query.workOrderId
+            ? this.$route.query.workOrderId
+            : null,
           taskId: this.taskObj && this.taskObj.id,
+          workOrderCode: this.workOrderCode,
           ...where
         });
       },
 
+      handleSearch() {
+        this.reload()
+      },
+
       /* 刷新表格 */
       reload(where) {
         this.$nextTick(() => {
@@ -260,7 +273,6 @@
           return this.$message.warning('请选择报工类型相同的工单');
         }
 
-        
         let ids = [];
         ids = val.map((item) => {
           return item.id;

src/views/produce/components/search.vue

@@ -24,6 +24,7 @@
           </el-select>
         </el-form-item>
 
+
         <el-form-item label="设备名称:">
           <el-input
             clearable
@@ -31,6 +32,8 @@
             placeholder="请输入"
           />
         </el-form-item>
+
+  
       </el-form>
     </div>
     <div class="right">

src/views/produceWord/index.vue

@@ -1,4 +1,4 @@
-<template>
+r++<template>
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
       <order-search @search="reload" ref="searchRef"> </order-search>
@@ -213,7 +213,8 @@
             label: '创建时间',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 110,
+             sortable: 'custom'
           },
           {
             slot: 'status',