首道工序扫描卷 2022年12月7日 sxm

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 替换成 /

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)

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"