From f36b9141b38f1016995e715818e05d98eb803bb0 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 7 Dec 2022 13:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=81=93=E5=B7=A5=E5=BA=8F=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=8D=B7=202022=E5=B9=B412=E6=9C=887=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                                        |  2 +-
 src/api/yieldReport/com_produce_material.js            |  4 +++-
 .../modules/yieldReport/com_produce_report_normal.vue  | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/index.js b/config/index.js
index 3f5ea9e..79d8e71 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
-        target: 'http://192.168.1.83:9091',
+        target: 'http://127.0.0.1:9090',
         changeOrigin: true,
         pathRewrite: {
           // 把 /proxyApi 替换成 /
diff --git a/src/api/yieldReport/com_produce_material.js b/src/api/yieldReport/com_produce_material.js
index 78748d3..9db6b57 100644
--- a/src/api/yieldReport/com_produce_material.js
+++ b/src/api/yieldReport/com_produce_material.js
@@ -9,5 +9,7 @@ export const feedingMaterialRoll = data => createAPI('schedule/feedingMaterialRo
 
 export const scannerMaterial = data => createAPI('schedule/scannerMaterial', 'POST', data)
 
-
+// 主材校验
 export const getBomItemNosByKeyPartNo = data => createAPI('schedule/getBomItemNosByKeyPartNo', 'POST', data)
+// 主材上机
+export const feedingKeyMaterialRoll = data => createAPI('schedule/feedingKeyMaterialRoll', 'POST', data)
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 2aad3e3..543a187 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -475,11 +475,11 @@
                              style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
                     {{ buttons.notProduce }}
                   </el-button>
-<!--                  <el-button type="primary" @click="produceKeyMaterialModal"-->
-<!--                             :disabled="!buttonTags.createNewRollFlag"-->
-<!--                             style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">-->
-<!--                    {{ buttons.scannerRoll }}-->
-<!--                  </el-button>-->
+                  <el-button type="primary" @click="produceKeyMaterialModal"
+                             :disabled="buttonTags.createNewRollFlag"
+                             style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
+                    {{ buttons.scannerRoll }}
+                  </el-button>
                 </div>
                 <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"
                            style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"