优化

src/views/produce/components/feeding/components/instanceBom.vue

@@ -1,11 +1,150 @@
 <template>
   <div>
     <div class="title_box rx-bc mt6">
-      <div class="name">物料清单({{list.length || 0}})个 </div>
+      <div class="name">物料清单({{ list.length || 0 }})个 </div>
 
       <div class="rx-bc"> </div>
     </div>
 
+    <el-table
+      :ref="`tableRef${idx}`"
+      class="table_content"
+      :max-height="600"
+      :data="list"
+      tooltip-effect="dark"
+      style="width: 100%"
+      stripe
+      border
+    >
+ 
+      <el-table-column label="序号" type="index" width="55">
+        <template slot-scope="{ row, $index }">
+          {{ $index }} 
+        </template>
+      </el-table-column>
+
+
+      <el-table-column label="编码" type="code" >
+        <template slot-scope="{ row, $index }">
+          {{ row.code}}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="名称" type="name" >
+        <template slot-scope="{ row, $index }">
+          {{ row.name}}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="型号" type="modelType" >
+        <template slot-scope="{ row, $index }">
+          {{ row.modelType}}
+        </template>
+      </el-table-column>
+
+      
+      <el-table-column label="规格" type="specification" >
+        <template slot-scope="{ row, $index }">
+          {{ row.specification}}
+        </template>
+      </el-table-column>
+
+            
+      <el-table-column label="牌号" type="brandNum" >
+        <template slot-scope="{ row, $index }">
+          {{ row.brandNum}}
+        </template>
+      </el-table-column>
+
+
+      <el-table-column label="包装库存" type="brandNum" >
+        <template slot-scope="{ row, $index }">
+          {{ row.packingCountBase }}/ {{ row.minUnit }}
+        </template>
+      </el-table-column>
+   
+
+      <el-table-column  v-if="singleReport == 1" :label="currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'" type="weightUnit" >
+        <template slot-scope="{ row, $index }">
+          <div v-if="currentTaskDiagram.isFirstTask == 1">
+              {{ row.extInfo.weight || 0 }} {{ row.extInfo.weightUnit }}</div
+            >
+            <div  v-if="currentTaskDiagram.isFirstTask == 0">
+              {{ row.extInfo.newWeight || 0 }}
+              {{ row.extInfo.weightUnit }}</div
+            >
+        </template>
+      </el-table-column>
+
+
+      <el-table-column  v-if="singleReport == 1" label="刻码" type="engrave" >
+        <template slot-scope="{ row, $index }">
+          {{ row.extInfo.engrave }}
+        </template>
+      </el-table-column>
+
+      <el-table-column  v-if="singleReport == 1" label="物料代号" type="materielCode" >
+        <template slot-scope="{ row, $index }">
+          {{ row.extInfo.materielCode }}
+        </template>
+      </el-table-column>
+
+
+      <el-table-column  v-if="singleReport == 1  && deviceList.length > 0" width="140" label="设备" type="deviceId" >
+        <template slot-scope="{ row, $index }">
+          <el-select
+                v-model="row.deviceId"
+                placeholder="请选择"
+                @change="(e) => selectVal(e, row, index)"
+                   size="mini"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :label="item.name + '-' + item.codeNumber"
+                  :value="item.id"
+                  :key="item.id"
+                >
+                </el-option>
+              </el-select>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column  v-if="singleReport == 1" label="炉次号" width="110" type="heatNumber" >
+        <template slot-scope="{ row, $index }">
+          <el-input
+                size="mini"
+                v-model="row.extInfo.heatNumber"
+                placeholder="请输入炉次号"
+              />
+        </template>
+      </el-table-column>
+
+      <el-table-column  v-if="singleReport == 1" label="数量" width="110" type="feedQuantity" >
+        <template slot-scope="{ row, $index }">
+          <el-input
+                size="mini"
+                v-model="row.feedQuantity"
+                placeholder="数量"
+              />
+        </template>
+      </el-table-column>
+
+      
+      <el-table-column  v-if="singleReport == 1" label="位置" width="110" type="feedQuantity" >
+        <template slot-scope="{ row, $index }">
+         {{row.extInfo.position}}
+        </template>
+      </el-table-column>
+
+      
+
+
+
+
+
+    </el-table>
+    <!-- 
     <div class="material">
       <div class="content_table mb4" v-for="(item, index) in list" :key="index">
         <div class="item rx-sc">
@@ -138,7 +277,7 @@
           ></el-link>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -160,6 +299,9 @@
       isDetails: {
         type: Boolean,
         default: false
+      },
+      singleReport: {
+        default: null
       }
     },
 

src/views/produce/components/feeding/index.vue

@@ -66,6 +66,7 @@
           :list="item.instanceList"
           :equipmentList="item.equipmentList"
           :currentTaskDiagram="item.currentTaskDiagram"
+          :singleReport="item.singleReport"
         ></instanceBom>
 
         <semiProductBom

src/views/produce/index.vue

@@ -7,8 +7,8 @@
         space="0px"
           width="45%"
         :resizable="true"
-        :min-size="300"
-        :max-size="-300"
+        :min-size="200"
+        :max-size="-200"
         :left-style="{
           background: 'rgba(185, 182, 229, .4)',
           overflow: 'hidden',
@@ -46,6 +46,13 @@
 
       <footBtn @footBtn="footBtn"></footBtn>
     </div>
+
+        <!--领料弹框 -->
+        <picking
+      v-if="pickingShow"
+      @close="pickingClose"
+      :workListIds="workListIds"
+    ></picking>
   </div>
 </template>
 

vue.config.js

@@ -32,8 +32,8 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.107:18086',
-
+        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.107:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {