领料申请是否补料按钮

src/api/mes/pro/request.js

@@ -51,3 +51,11 @@ export function delMaterialRequest(materialRequestId) {
     method: 'delete'
   })
 }
+
+// 确认补货按钮
+export function confirmMaterialRequest(materialRequestId) {
+  return request({
+    url:  '/pro/materialRequest/confirm/' + materialRequestId,
+    method: 'get'
+  })
+}
\ No newline at end of file

src/views/mes/md/product/index.vue

@@ -273,9 +273,9 @@
         <!--        <el-tab-pane label="客户信息">
           <Customer :optType="optType" :itemId="form.itemId"></Customer>
         </el-tab-pane>-->
-        <el-tab-pane label="产品外观" name="Look">
+        <!-- <el-tab-pane label="产品外观" name="Look">
           <Look ref="Look" :optType="optType" :itemId="form.itemId"></Look>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="生产版本" name="ProductionPlan">
           <ProductionPlan ref="ProductionPlan" :optType="optType" :itemId="form.itemId"></ProductionPlan>
         </el-tab-pane>
@@ -360,7 +360,7 @@ import {
 } from "@/api/mes/md/mdItem";
 
 import BaseInfo from "./components/baseInfo.vue";
-import Look from "./components/look.vue";
+// import Look from "./components/look.vue";
 import ProductionPlan from "./components/productionPlan.vue";
 import { listAllUnitmeasure } from "@/api/mes/md/unitmeasure";
 import { genCode } from "@/api/system/autocode/rule";
@@ -375,7 +375,7 @@ export default {
   components: {
     Treeselect,
     BaseInfo,
-    Look,
+    // Look,
     ProductionPlan,
 
   },
@@ -610,9 +610,9 @@ export default {
             //基本信息保存
             const baseInfoData = await this.$refs["BaseInfo"].getBaseInfoData();
             baseInfoData.itemId = this.form.itemId;
-            //产品外观保存
-            const lookData = await this.$refs["Look"].getLookFormData();
-            lookData.itemId = this.form.itemId;
+            // //产品外观保存
+            // const lookData = await this.$refs["Look"].getLookFormData();
+            // lookData.itemId = this.form.itemId;
 
             //产品参数配置保存  publishedConf
             const publishedConfData = await this.$refs[

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

@@ -46,6 +46,18 @@
           >打印
         </el-button>
       </el-col>
+       <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="confirmUpdate"
+          v-hasPermi="['pro:materialRequest:edit']"
+        >确认补料</el-button>
+      </el-col>
+      
       <!--   <el-col :span="1.5">
         <el-button
           type="success"
@@ -333,7 +345,7 @@
 </template>
 
 <script>
-import { listMaterialRequest, getMaterialRequest, delMaterialRequest, addMaterialRequest, updateMaterialRequest, materialRequestPrintInfo } from "@/api/mes/pro/request";
+import {confirmMaterialRequest, listMaterialRequest, getMaterialRequest, delMaterialRequest, addMaterialRequest, updateMaterialRequest, materialRequestPrintInfo } from "@/api/mes/pro/request";
 import { genCode } from "@/api/system/autocode/rule";
 import BrandSelect from "./components/taskSelect.vue";
 import arangeSelect from "./components/arangeSelect.vue";
@@ -651,6 +663,18 @@ export default {
         this.optType = "edit";
       });
     },
+
+     /** 确认补货按钮 */
+     confirmUpdate(row) {
+      this.reset();
+      const materialRequestId = row.materialRequestId || this.ids
+      confirmMaterialRequest(materialRequestId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "确认补料";
+        this.optType = "edit";
+      });
+    },
     //  查询明细按钮操作
     handleView(row) {
       this.reset();

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

@@ -57,6 +57,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="申请单编码" prop="applyNo">
+        <el-input
+          v-model="queryParams.applyNo"
+          placeholder="请输入申请单编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangePurchaseDate"
@@ -141,14 +149,14 @@
       </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="isQualified" width="100">
+       <!-- <el-table-column label="是否合格" align="center" prop="isQualified" width="100">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.sys_yes_non"
             :value="scope.row.isQualified"
           />
         </template>
-      </el-table-column>
+      </el-table-column> -->
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
            <el-button