ysy hai 1 ano
pai
achega
4f5da341f9

+ 0 - 133
src/views/produce/components/feeding/components/instanceBom.vue

@@ -151,140 +151,7 @@
 
 
     </el-table>
-    <!-- 
-    <div class="material">
-      <div class="content_table mb4" v-for="(item, index) in list" :key="index">
-        <div class="item rx-sc">
-          <div class="rx ww33">
-            <div class="lable rx-cc">编码</div>
-            <div class="content">
-              {{ item.code }}
-            </div>
-          </div>
-
-          <div class="rx ww33">
-            <div class="lable rx-cc">名称</div>
-            <div class="content">{{ item.name }}</div>
-          </div>
-
-          <div class="rx ww33">
-            <div class="lable rx-cc">型号</div>
-            <div class="content">{{ item.modelType }}</div>
-          </div>
-        </div>
-
-        <div class="item rx-sc">
-          <div class="rx ww33">
-            <div class="lable rx-cc">规格</div>
-            <div class="content rx-sc">
-              <div>{{ item.specification }}</div>
-            </div>
-          </div>
-
-          <div class="rx ww33">
-            <div class="lable rx-cc">牌号</div>
-            <div class="content rx-sc">
-              <div>{{ item.brandNum }}</div>
-            </div>
-          </div>
-
-          <div class="rx ww33">
-            <div class="lable rx-cc">包装库存</div>
-            <div class="content rx-sc">
-              <div>{{ item.packingCountBase }}/ {{ item.minUnit }}</div>
-            </div>
-          </div>
-        </div>
-
-        <div class="item rx-sc" v-if="item.isConsumable == 0">
-          <div class="rx ww33">
-            <div class="lable rx-cc">{{
-              currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'
-            }}</div>
-            <div class="content" v-if="currentTaskDiagram.isFirstTask == 1">
-              {{ item.extInfo.weight || 0 }} {{ item.extInfo.weightUnit }}</div
-            >
-            <div class="content" v-if="currentTaskDiagram.isFirstTask == 0">
-              {{ item.extInfo.newWeight || 0 }}
-              {{ item.extInfo.weightUnit }}</div
-            >
-          </div>
-
-          <div class="rx ww33">
-            <div class="lable rx-cc">刻码</div>
-            <div class="content">{{ item.extInfo.engrave }}</div>
-          </div>
-
-          <div class="rx ww33">
-            <div class="lable rx-cc">物料代号</div>
-            <div class="content">{{ item.extInfo.materielCode }}</div>
-          </div>
-        </div>
-
-        <div
-          class="item rx-sc"
-          v-if="item.isConsumable == 0 && deviceList.length > 0"
-        >
-          <div class="rx ww33">
-            <div class="lable rx-cc">设备</div>
-            <div class="content content_num">
-              <el-select
-                v-model="item.deviceId"
-                placeholder="请选择"
-                @change="(e) => selectVal(e, item, 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>
-            </div>
-          </div>
 
-          <div class="rx ww33">
-            <div class="lable rx-cc">炉次号</div>
-            <div class="content content_num rx-sc">
-              <el-input
-                size="mini"
-                v-model="item.extInfo.heatNumber"
-                placeholder="请输入炉次号"
-              />
-            </div>
-          </div>
-        </div>
-
-        <div class="item rx-sc">
-          <div class="rx ww33">
-            <div class="lable rx-cc">数量</div>
-            <div class="content content_num rx-sc">
-              <el-input
-                size="mini"
-                v-model="item.feedQuantity"
-                placeholder="数量"
-              >
-              </el-input>
-            </div>
-          </div>
-
-          <div class="rx ww33" v-if="item.isConsumable == 0">
-            <div class="lable rx-cc">位置</div>
-            <div class="content">{{ item.extInfo.position }}</div>
-          </div>
-        </div>
-
-        <div class="del_box">
-          <el-link
-            type="danger"
-            icon="el-icon-delete"
-            @click="getDelete(index)"
-          ></el-link>
-        </div>
-      </div>
-    </div> -->
   </div>
 </template>
 <script>

+ 145 - 132
src/views/produce/components/feeding/components/semiProductBom.vue

@@ -5,142 +5,151 @@
   
         <div class="rx-bc"> </div>
       </div>
-  
-      <div class="material">
-        <div class="content_table mb4" v-for="(item, index) in list" :key="index">
-          <div class="item rx-sc">
-            <div class="rx ww33">
-              <div class="lable rx-cc">编码</div>
-              <div class="content">
-                {{ item.code }}
-              </div>
-            </div>
-  
-            <div class="rx ww33">
-              <div class="lable rx-cc">名称</div>
-              <div class="content">{{ item.name }}
-                ({{item.rootCategoryLevelId == 2 ? '在制品' :  item.rootCategoryLevelId == 23 ? '半成品' :  item.rootCategoryLevelId == 9 ? '产品' :   item.rootCategoryLevelId == 28 ? '废品' : ''  }})
-              </div>
-            </div>
-  
-            <div class="rx ww33">
-              <div class="lable rx-cc">型号</div>
-              <div class="content">{{ item.modelType }}</div>
-            </div>
-          </div>
-  
-          <div class="item rx-sc">
-            <div class="rx ww33">
-              <div class="lable rx-cc">规格</div>
-              <div class="content rx-sc">
-                <div>{{ item.specification }}</div>
-              </div>
-            </div>
-  
-            <div class="rx ww33">
-              <div class="lable rx-cc">牌号</div>
-              <div class="content rx-sc">
-                <div>{{ item.brandNum }}</div>
-              </div>
-            </div>
-  
-            <div class="rx ww33">
-              <div class="lable rx-cc">包装库存</div>
-              <div class="content rx-sc">
-                <div>{{ item.packingCountBase }}/ {{ item.minUnit }}</div>
-              </div>
-            </div>
-          </div>
-  
-          <div class="item rx-sc" v-if="item.isConsumable == 0">
-            <div class="rx ww33">
-              <div class="lable rx-cc">{{
-                currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'
-              }}</div>
-              <div class="content" v-if="currentTaskDiagram.isFirstTask == 1">
-                {{ item.extInfo.weight || 0 }} {{ item.extInfo.weightUnit }}</div
+
+
+      <el-table
+      :ref="`semiProductBom${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" minWidth="110" >
+        <template slot-scope="{ row, $index }">
+          {{ row.code}}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="名称" type="name"  minWidth="110">
+        <template slot-scope="{ row, $index }">
+          {{ row.name}}  ({{row.rootCategoryLevelId == 2 ? '在制品' :  row.rootCategoryLevelId == 23 ? '半成品' :  row.rootCategoryLevelId == 9 ? '产品' :   item.rootCategoryLevelId == 28 ? '废品' : ''  }})
+        </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"
               >
-              <div class="content" v-if="currentTaskDiagram.isFirstTask == 0">
-                {{ item.extInfo.newWeight || 0 }}
-                {{ item.extInfo.weightUnit }}</div
-              >
-            </div>
-  
-            <div class="rx ww33">
-              <div class="lable rx-cc">刻码</div>
-              <div class="content">{{ item.extInfo.engrave }}</div>
-            </div>
-  
-            <div class="rx ww33">
-              <div class="lable rx-cc">物料代号</div>
-              <div class="content">{{ item.extInfo.materielCode }}</div>
-            </div>
-          </div>
-  
-          <div
-            class="item rx-sc"
-            v-if="item.isConsumable == 0 && deviceList.length > 0"
-          >
-            <div class="rx ww33">
-              <div class="lable rx-cc">设备</div>
-              <div class="content content_num">
-                <el-select
-                  v-model="item.deviceId"
-                  placeholder="请选择"
-                  @change="(e) => selectVal(e, item, index)"
-                  size="mini"
+                <el-option
+                  v-for="item in deviceList"
+                  :label="item.name + '-' + item.codeNumber"
+                  :value="item.id"
+                  :key="item.id"
                 >
-                  <el-option
-                    v-for="item in deviceList"
-                    :label="item.name + '-' + item.codeNumber"
-                    :value="item.id"
-                    :key="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
-            </div>
-  
-            <div class="rx ww33">
-              <div class="lable rx-cc">炉次号</div>
-              <div class="content content_num rx-sc">
-                <el-input
-                  size="mini"
-                  v-model="item.extInfo.heatNumber"
-                  placeholder="请输入炉次号"
-                />
-              </div>
-            </div>
-          </div>
-  
-          <div class="item rx-sc">
-            <div class="rx ww33">
-              <div class="lable rx-cc">数量</div>
-              <div class="content content_num rx-sc">
-                <el-input
-                  size="mini"
-                  v-model="item.feedQuantity"
-                  placeholder="数量"
+                </el-option>
+              </el-select>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column  v-if="singleReport == 1" label="炉次号" width="90" 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="90" 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-column label="操作" fixed="right" width="60px">
+              <template slot-scope="{ $index, row }">
+                <el-link type="danger" @click="getDelete($index)"
+                  >删除</el-link
                 >
-                </el-input>
-              </div>
-            </div>
+              </template>
+            </el-table-column>
+      
+
+    </el-table>
   
-            <div class="rx ww33" v-if="item.isConsumable == 0">
-              <div class="lable rx-cc">位置</div>
-              <div class="content">{{ item.extInfo.position }}</div>
-            </div>
-          </div>
   
-          <div class="del_box">
-            <el-link
-              type="danger"
-              icon="el-icon-delete"
-              @click="getDelete(index)"
-            ></el-link>
-          </div>
-        </div>
-      </div>
     </div>
   </template>
   <script>
@@ -162,7 +171,11 @@
         isDetails: {
           type: Boolean,
           default: false
-        }
+        },
+
+        singleReport: {
+        default: null
+      }
       },
   
       watch: {

+ 1 - 0
src/views/produce/components/feeding/index.vue

@@ -74,6 +74,7 @@
           :list="item.semiProductList"
           :equipmentList="item.equipmentList"
           :currentTaskDiagram="item.currentTaskDiagram"
+          :singleReport="item.singleReport"
         ></semiProductBom>
 
         <turnoverBom

+ 3 - 5
src/views/produce/components/produceOrder.vue

@@ -63,7 +63,7 @@
             slot: 'code',
             label: '生产工单号',
             align: 'center',
-            minWidth:"110"
+            minWidth: '110'
           },
           {
             prop: '',
@@ -76,17 +76,15 @@
             align: 'center'
           },
 
-      
           {
             prop: 'productCode',
             label: '产品编码',
-            align: 'center',
-
+            align: 'center'
           },
           {
             prop: 'productName',
             label: '产品名称',
-            align: 'center',
+            align: 'center'
           },
 
           {