退料申请界面优化

src/api/mes/pro/return.js

@@ -9,6 +9,15 @@ export function listMaterialReturn(query) {
   })
 }
 
+// 查询退料申请列表
+export function listMaterialReturns(query) {
+  return request({
+    url: '/pro/materialReturn/lists',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询退料申请详细
 export function getMaterialReturn(materialReturnId) {
   return request({

src/components/request/requestItem.vue

@@ -29,7 +29,7 @@
         <el-table-column label="产品编号" align="center" prop="sapItemCode" width="300" />
       <el-table-column label="产品名称" align="center" prop="itemName" width="300" />
       <el-table-column label="生产工单" align="center" prop="workorderCode" width="200" />
-      
+      <el-table-column label="申请单号" align="center" prop="applyNo" width="200" />
       <el-table-column label="领用数量" align="center" prop="applyNum" width="200"/>
       <el-table-column label="发料状态" align="center" prop="grantNumType">
         <template slot-scope="scope">

src/views/mes/pro/return/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="产品编号" prop="sapItemCode">
-        <el-input
-          v-model="queryParams.sapItemCode"
-          placeholder="请输入产品编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品名称" prop="itemName">
-        <el-input
-          v-model="queryParams.itemName"
-          placeholder="请输入产品名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工单号" prop="workorderCode">
-        <el-input
-          v-model="queryParams.workorderCode"
-          placeholder="请输入工单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退料数量" prop="backNum">
-        <el-input
-          v-model="queryParams.backNum"
-          placeholder="请输入退料数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="批次号" prop="batchNo">
-        <el-input
-          v-model="queryParams.batchNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="卷号" prop="packNo">
-        <el-input
-          v-model="queryParams.packNo"
-          placeholder="请输入卷号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="创建人" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
@@ -65,6 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="编排单号" prop="arrangeCode">
+        <el-input
+          v-model="queryParams.arrangeCode"
+          placeholder="请输入编排单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangePurchaseDate"
@@ -126,20 +86,19 @@
       <!-- </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
+    <requestItems ref="requestitemsref" key="requestitemsref" :applyNos="applyNos" ></requestItems>
     <el-table v-loading="loading" :data="materialReturnList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="100" align="center" />
-      <el-table-column label="产品编码" align="center" prop="sapItemCode" width="150"/>
-      <el-table-column label="产品名称" align="center" prop="itemName" width="150"/>
-      <el-table-column label="申请单编码" align="center" prop="applyNo" width="150"/>
-      <el-table-column label="工作单元编码" align="center" prop="workunitCode" width="150"/>
-      <el-table-column label="工作单元名称" align="center" prop="workunitName" width="150"/>
-      <el-table-column label="生产工单" align="center" prop="workorderCode" width="150"/>
-      <el-table-column label="批次号" align="center" prop="batchNo" width="100"/>
-      <el-table-column label="卷号" align="center" prop="packNo" width="100"/>
-      <el-table-column label="申请退料数量" align="center" prop="backNum" width="100"/>
-      <el-table-column label="已退料数量" align="center" prop="returnNum" width="100"/>
-      <el-table-column label="是否结案" align="center" prop="windCase" width="100">
+      <el-table-column label="申请单号" align="center" prop="applyNo" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="showCombDetail(scope.row.applyNo)" >{{
+            scope.row.applyNo }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="编排单号" align="center" prop="arrangeCode" />
+      <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
+      <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+      <el-table-column label="是否结案" align="center" prop="windCase" >
       <template slot-scope="scope">
           <dict-tag
             :options="dict.type.sys_yes_no"
@@ -147,8 +106,8 @@
           />
         </template>
       </el-table-column>
-       <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
-       <el-table-column label="创建时间" width="170" align="center" prop="createTime" />
+       <el-table-column label="创建人" align="center" prop="createBy" />
+       <el-table-column label="创建时间"  align="center" prop="createTime" />
        <!-- <el-table-column label="是否合格" align="center" prop="isQualified" width="100">
         <template slot-scope="scope">
           <dict-tag
@@ -254,9 +213,10 @@
 </template>
 
 <script>
-import { listMaterialReturn, getMaterialReturn, delMaterialReturn, addMaterialReturn, updateMaterialReturn } from "@/api/mes/pro/return";
-
+import { listMaterialReturns,listMaterialReturn, getMaterialReturn, delMaterialReturn, addMaterialReturn, updateMaterialReturn } from "@/api/mes/pro/return";
+import requestItems from "@/components/MaterialReturn/returnItem.vue";
 export default {
+  components: {requestItems},
   name: "MaterialReturn",
   dicts: ['sys_yes_non','sys_yes_no'],
   data() {
@@ -271,6 +231,8 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+
+      applyNos: null,
       // 总条数
       total: 0,
       // 退料申请表格数据
@@ -291,6 +253,7 @@ export default {
         itemCode: null,
         itemName: null,
         createBy: null,
+        arrangeCode: null,
         createTime: null,
         issueLineId: null,
         workOrderId: null,
@@ -324,7 +287,7 @@ export default {
         this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
         this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
       }
-      listMaterialReturn(this.queryParams).then(response => {
+      listMaterialReturns(this.queryParams).then(response => {
         this.materialReturnList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -351,6 +314,7 @@ export default {
         createBy: null,
         createTime: null,
         isQualified: null,
+        arrangeCode: null,
         batchNo: null,
         packNo: null,
         remark: null,
@@ -368,6 +332,12 @@ export default {
       
       this.resetForm("form");
     },
+
+    showCombDetail(applyNo) {
+        this.$refs.requestitemsref.showFlag = true;
+        this.applyNos= applyNo;
+    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -404,14 +374,9 @@ export default {
       });
     },
      handleView(row){
-      this.reset();
-      const materialReturnId = row.materialReturnId || this.ids;
-      getMaterialReturn(materialReturnId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "查看退料申请单";
-        this.optType = "view";
-      });
+     const applyNo = row.applyNo || this.applyNo;
+     this.$refs.requestitemsref.showFlag = true;
+     this.applyNos= applyNo;
     },
     /** 提交按钮 */
     submitForm() {