333

src/api/byProduct/index.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request';
+
+export async function getPage(data) {
+  const res = await request.get('/mes/disposeorder/page', {
+    params: data
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/byProduct/components/product-search.vue

@@ -7,30 +7,62 @@
       @submit.native.prevent
     >
       <el-row :gutter="15">
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-          <el-form-item label="副产品单号:">
+        <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
+          <el-form-item label="处置单号:">
             <el-input
               size="mini"
               clearable
-              v-model="where.workOrderId"
+              v-model="where.code"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
   
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
           <el-form-item label="工单号:">
             <el-input
               size="mini"
               clearable
-              v-model="where.joinWorkOrderCode"
+              v-model="where.workOrderCode"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
+
+
+
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
+        <el-form-item label="工序名称:">
+  
+          <el-select size="mini"   v-model="where.taskId"  filterable>
+            <el-option
+              v-for="(item, index) in produceTaskList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+
+
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
+          <el-form-item label="物品名称:">
+            <el-input
+              size="mini"
+              clearable
+              v-model="where.categoryName"
+              placeholder="请输入"
+            />
+          </el-form-item>
+        </el-col>
+
+
+        
   
 
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4 }">
           <el-form-item label-width="0px">
             <el-button
               size="mini"
@@ -55,6 +87,7 @@
   </template>
   
   <script>
+    import { produceTask } from '@/api/InTheSystem/index';
     export default {
       props: {
   
@@ -62,13 +95,16 @@
       data() {
         // 默认表单数据
         const defaultWhere = {
-          workOrderId: '',
-          joinWorkOrderCode: '',
-          status: ''
+          code: '',
+          workOrderCode: '',
+          taskId: '',
+          categoryName: ''
         };
         return {
           // 表单数据
           where: { ...defaultWhere },
+
+          produceTaskList: []
         };
       },
       computed: {
@@ -78,8 +114,25 @@
         }
       },
       watch: {},
-      created() {},
+      created() {
+        this.getTaskList();
+      },
       methods: {
+
+        getTaskList() {
+        produceTask().then((res) => {
+          this.produceTaskList = res.list;
+          this.where.taskId =  res.list[0].id
+
+
+           if(this.where.taskId) {
+            this.$emit('search', this.where);
+           }
+        
+        });
+      },
+
+
         /* 搜索 */
         search() {
           this.$emit('search', this.where);

src/views/byProduct/index.vue

@@ -17,34 +17,26 @@
         @update:selection="handleSelectionChange"
       >
         <template v-slot:toolbar>
-          <el-button
-            type="primary"
-            size="mini"
-            @click="handPick"
-            >工单领料</el-button
-          >
+ 
           <el-button
             type="primary"
           
             size="mini"
             @click="handSelfPick"
-            >自建领料单</el-button
+            >自建处置单</el-button
           >
         </template>
 
-        <template v-slot:joinWorkOrderCode="{ row }">
-          <el-tag type="warning" v-if="row.type == 1">自建领料单</el-tag>
-          <div v-else>{{ row.joinWorkOrderCode }}</div>
+
+        <template v-slot:formedNum="{ row }">
+          {{  row.notFormedNum  || 0 }} /   {{  row.formedNum  || 0 }} 
         </template>
 
-        <template v-slot:status="{ row }">
-          <el-tag
-            :type="['danger', 'success', 'warning', 'danger'][row.status]"
-            effect="dark"
-            >{{ statusList[row.status] }}</el-tag
-          >
+        <template v-slot:weight="{ row }">
+          {{  row.weight  || 0 }} /   {{  row.weightUnit   }} 
         </template>
 
+
         <template v-slot:action="{ row }">
           <el-button type="text" size="mini" @click="handDetailed(row)"
             >详情</el-button
@@ -71,7 +63,7 @@
 </template>
 
 <script>
-  import { getPage, returnPage } from '@/api/pick/pickApply';
+  import { getPage, returnPage } from '@/api/byProduct/index';
 
   import productSearch from './components/product-search.vue';
 
@@ -113,46 +105,68 @@
         
           {
             prop: 'code',
-            label: '领料单编号',
-            align: 'center'
+            label: '处置单号',
+            align: 'left',
+            
           },
 
           {
-            prop: 'joinWorkOrderCode',
-            slot: 'joinWorkOrderCode',
-            label: '关联工单编号',
+            prop: 'workOrderCode',
+            label: '工单编码',
             align: 'center'
           },
-
           {
-            prop: 'joinWarehouseName',
-            label: '领料仓库名称',
+            prop: 'taskName',
+            label: '工序',
             align: 'center'
           },
 
+          
           {
-            prop: 'joinReviewerName',
-            label: '关联审核人',
+            prop: 'categoryCode',
+            label: '物品编码',
             align: 'center'
           },
 
           {
-            prop: 'executorName',
-            label: '领料人',
+            prop: 'categoryName',
+            label: '物品名称',
             align: 'center'
           },
 
+
           {
-            prop: 'createTime',
-            label: '领料时间',
-            align: 'center'
+            prop: 'formedNum',
+            slot: 'formedNum',
+            label: '不合格品/合格品数量',
+            align: 'center',
+            width: 140,
           },
+
           {
-            prop: 'status',
-            slot: 'status',
-            label: '状态',
-            align: 'center'
+            prop: 'weight',
+            slot: 'weight',
+            label: '重量',
+            align: 'center',
+            width: 140,
+          },
+
+   
+          {
+            prop: 'executorName',
+            label: '处置人',
+            align: 'center',
+            width: 95,
           },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            width: 95,
+          },
+
+
+
 
           {
             prop: '',