55

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

@@ -36,6 +36,35 @@
         </template>
       </el-table-column>
 
+      <el-table-column label="数量" width="90" type="feedQuantity">
+        <template slot-scope="{ row, $index }">
+          <el-input
+            size="mini"
+            class="content_num"
+            v-model="row.feedQuantity"
+            placeholder="数量"
+          />
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport ==1"
+        label="位置"
+        width="110"
+        type="feedQuantity"
+      >
+        <template slot-scope="{ row, $index }">
+          <el-input
+            size="mini"
+            class="content_num"
+            v-model="row.extInfo.position"
+            placeholder="位置"
+          />
+
+        </template>
+      </el-table-column>
+      
+
       <el-table-column label="型号" type="modelType">
         <template slot-scope="{ row, $index }">
           {{ row.modelType }}
@@ -150,27 +179,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="数量" width="90" type="feedQuantity">
-        <template slot-scope="{ row, $index }">
-          <el-input
-            size="mini"
-            class="content_num"
-            v-model="row.feedQuantity"
-            placeholder="数量"
-          />
-        </template>
-      </el-table-column>
 
-      <el-table-column
-        v-if="clientEnvironmentId == 3 && workInfo.singleReport ==1"
-        label="位置"
-        width="110"
-        type="feedQuantity"
-      >
-        <template slot-scope="{ row, $index }">
-          {{ row.extInfo.position }}
-        </template>
-      </el-table-column>
 
       <el-table-column
         label="操作"

src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -22,28 +22,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="次数" prop="index" width="80">
-        <template slot-scope="{ row, $index }">
-          <div
-            class="tag_box"
-            v-if="
-              Object.prototype.hasOwnProperty.call(row, 'extInfo') &&
-              Object.prototype.hasOwnProperty.call(
-                row.extInfo,
-                'productionTimes'
-              ) &&
-              Object.prototype.hasOwnProperty.call(
-                row.extInfo.productionTimes,
-                item.currentTaskDiagram.taskId
-              )
-            "
-          >
-            {{ row.extInfo.productionTimes[item.currentTaskDiagram.taskId] }}
-          </div>
 
-          <div class="tag_box" v-if="row.isCache">缓</div>
-        </template>
-      </el-table-column>
 
       <el-table-column label="编码" prop="code" minWidth="110">
         <template slot-scope="{ row, $index }">
@@ -69,29 +48,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="型号" prop="modelType">
-        <template slot-scope="{ row, $index }">
-          {{ row.modelType }}
-        </template>
-      </el-table-column>
-
-      <el-table-column label="规格" prop="specification">
-        <template slot-scope="{ row, $index }">
-          {{ row.specification }}
-        </template>
-      </el-table-column>
-
-      <el-table-column label="牌号" prop="brandNum">
-        <template slot-scope="{ row, $index }">
-          {{ row.brandNum }}
-        </template>
-      </el-table-column>
-
-      <el-table-column label="包装库存" prop="brandNum">
-        <template slot-scope="{ row, $index }">
-          {{ row.packingCountBase }}/ {{ row.minUnit }}
-        </template>
-      </el-table-column>
 
       <el-table-column
         v-if="singleReport == 1"
@@ -220,14 +176,26 @@
       <el-table-column
         v-if="singleReport == 1"
         label="物料重量"
-        width="110"
+        width="150"
         prop="weight"
+
       >
-        <template slot-scope="{ row, $index }">
+        <template slot-scope="{ row, $index }"         >
           <div class="tag_box">{{ row.extInfo.newWeight ? '上' : '原' }}</div>
-          <span>{{
-            row.extInfo.newWeight ? row.extInfo.newWeight : row.extInfo.weight
+          <span  v-if="Object.prototype.hasOwnProperty.call(row.extInfo, 'newWeight')">{{
+          row.extInfo.newWeight
           }}</span>
+
+         <el-input
+          v-if="!Object.prototype.hasOwnProperty.call(row.extInfo, 'newWeight')"
+            size="mini"
+            class="content_num2"
+            style="width: 100px;"
+            v-model="row.extInfo.weight"
+            prop="digit"
+          />
+
+
         </template>
       </el-table-column>
 
@@ -286,6 +254,54 @@
         </template>
       </el-table-column>
 
+      <el-table-column label="次数" prop="index" width="80">
+        <template slot-scope="{ row, $index }">
+          <div
+            class="tag_box"
+            v-if="
+              Object.prototype.hasOwnProperty.call(row, 'extInfo') &&
+              Object.prototype.hasOwnProperty.call(
+                row.extInfo,
+                'productionTimes'
+              ) &&
+              Object.prototype.hasOwnProperty.call(
+                row.extInfo.productionTimes,
+                item.currentTaskDiagram.taskId
+              )
+            "
+          >
+            {{ row.extInfo.productionTimes[item.currentTaskDiagram.taskId] }}
+          </div>
+
+          <div class="tag_box" v-if="row.isCache">缓</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="型号" prop="modelType">
+        <template slot-scope="{ row, $index }">
+          {{ row.modelType }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="规格" prop="specification">
+        <template slot-scope="{ row, $index }">
+          {{ row.specification }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="牌号" prop="brandNum">
+        <template slot-scope="{ row, $index }">
+          {{ row.brandNum }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="包装库存" prop="brandNum">
+        <template slot-scope="{ row, $index }">
+          {{ row.packingCountBase }}/ {{ row.minUnit }}
+        </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>
@@ -668,7 +684,7 @@
     border-radius: 2px;
   }
 
-  .content_num {
+  .content_num2 {
     --input-background-color: #f0f8f2;
   }
 
@@ -780,5 +796,6 @@
     align-items: center;
     padding: 2px;
     --input-background-color: #f0f8f2;
+  
   }
 </style>