55

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

@@ -1,5 +1,6 @@
 <template>
-  <div>
+ <div>
+  <div v-if="isShow">
     <div class="top_fixed">
       <el-button type="primary" size="mini" @click="save(2, 'all')">一键投料(报工)</el-button>
       <el-button type="primary" size="mini" @click="removeCacheFn('all')">清空缓存</el-button>
@@ -52,6 +53,11 @@
 
     <pickingList isType="feed" ref="pickingListRef" @allSelection="allSelection"></pickingList>
   </div>
+
+  <div v-else>
+    <el-empty description="批量报工，不需要投料，直接去报工取样"></el-empty>
+  </div>
+</div>
 </template>
 
 <script>
@@ -126,6 +132,7 @@ export default {
       List: [],
       idsList: [],
       isLoad: false,
+      isShow: true
     };
   },
 
@@ -186,6 +193,14 @@ export default {
               m.product = '{}';
             }
 
+          if(this.clientEnvironmentId == 3 && this.taskObj.type == 6 && m.singleReport == 0){
+             this.isShow = false;
+            } else{
+            this.isShow = true;
+          }
+
+         
+
             delete m.id;
             if (this.taskObj.id) {
               m.taskId = this.taskObj.id;

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

@@ -22,25 +22,68 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="编码" type="code" minWidth="110">
+      <el-table-column label="编码" prop="code" minWidth="110">
         <template slot-scope="{ row, $index }">
           {{ row.code }}
         </template>
       </el-table-column>
 
-      <el-table-column label="名称" type="name" minWidth="110">
+      <el-table-column label="名称" prop="name" minWidth="110">
         <template slot-scope="{ row, $index }">
           {{ row.name }}
         </template>
       </el-table-column>
 
-      <el-table-column label="型号" type="modelType">
+      <el-table-column label="型号" prop="modelType">
         <template slot-scope="{ row, $index }">
           {{ row.modelType }}
         </template>
       </el-table-column>
 
-      <el-table-column label="规格" type="specification">
+      
+      <el-table-column label="外观" width="120" prop="appearance">
+        <template slot-scope="{ row, $index }">
+          <el-select
+            size="mini"
+            class="content_num"
+            filterable
+            v-model="row.extInfo.appearance"
+            placeholder="请选择"
+            :disabled="isDetails"
+          >
+            <el-option
+              v-for="item in qualityList"
+              :label="item.name"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="尺寸" width="120" prop="dimension">
+        <template slot-scope="{ row, $index }">
+          <el-select
+            size="mini"
+            class="content_num"
+            filterable
+            v-model="row.extInfo.dimension"
+            placeholder="请选择"
+            :disabled="isDetails"
+          >
+            <el-option
+              v-for="item in qualityList"
+              :label="item.name"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="规格" prop="specification">
         <template slot-scope="{ row, $index }">
           {{ row.specification }}
         </template>
@@ -52,76 +95,43 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="包装库存" type="brandNum">
+      <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"
-        :label="currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'"
-        type="weightUnit"
-      >
+      <el-table-column label="重量" prop="weightUnit">
         <template slot-scope="{ row, $index }">
-          <div v-if="currentTaskDiagram.isFirstTask == 1">
-            {{ row.extInfo.weight || 0 }} {{ row.extInfo.weightUnit }}</div
+          <div v-if="row.extInfo.newWeight">
+            {{ row.extInfo.newWeight || 0 }} {{ row.extInfo.weightUnit }}</div
           >
-          <div v-if="currentTaskDiagram.isFirstTask == 0">
-            {{ row.extInfo.newWeight || 0 }}
+          <div v-else>
+            {{ row.extInfo.weight || 0 }}
             {{ row.extInfo.weightUnit }}</div
           >
         </template>
       </el-table-column>
 
-      <el-table-column v-if="singleReport == 1" label="刻码" type="engrave">
+      <el-table-column label="刻码" prop="engrave">
         <template slot-scope="{ row, $index }">
           {{ row.extInfo.engrave }}
         </template>
       </el-table-column>
 
-      <el-table-column
-        v-if="singleReport == 1"
-        label="物料代号"
-        type="materielCode"
-      >
+      <el-table-column label="物料代号" prop="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"
-      >
+      <el-table-column width="140" label="设备" prop="deviceId">
         <template slot-scope="{ row, $index }">
-          <el-select
-            class="content_num"
-            v-model="row.deviceId"
-            filterable
-            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>
+          {{ row.deviceName }}
         </template>
       </el-table-column>
 
-      <el-table-column
-        v-if="singleReport == 1 && deviceList.length > 0"
-        label="炉次号"
-        width="90"
-        type="heatNumber"
-      >
+      <el-table-column label="炉次号" width="120" prop="heatNumber">
         <template slot-scope="{ row, $index }">
           <el-input
             size="mini"
@@ -132,34 +142,19 @@
         </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"
-            class="content_num"
-            v-model="row.feedQuantity"
-            placeholder="数量"
-          />
-        </template>
-      </el-table-column>
 
-      <el-table-column
-        v-if="singleReport == 1"
-        label="位置"
-        width="110"
-        type="feedQuantity"
-      >
+      <el-table-column label="位置" width="110" prop="feedQuantity">
         <template slot-scope="{ row, $index }">
           {{ row.extInfo.position }}
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" fixed="right" width="60px" v-if="!isDetails">
+      <el-table-column
+        label="操作"
+        fixed="right"
+        width="60px"
+        v-if="!isDetails"
+      >
         <template slot-scope="{ $index, row }">
           <el-link type="danger" @click="getDelete($index)">删除</el-link>
         </template>
@@ -182,27 +177,31 @@
         default: () => []
       },
 
-      currentTaskDiagram: {
-        type: Object,
-        default: () => {}
-      },
       isDetails: {
         type: Boolean,
         default: false
-      },
-      singleReport: {
-        default: null
       }
     },
 
     data() {
-      return {};
+      return {
+        qualityList: [
+          {
+            name: '合格',
+            value: 1
+          },
+          {
+            name: '不合格',
+            value: 2
+          }
+        ]
+      };
     },
 
     methods: {
       getDelete(index) {
         this.list.splice(index, 1);
-      } 
+      }
     }
   };
 </script>
@@ -211,4 +210,8 @@
   .materialBor {
     border: 1px solid #157a2c;
   }
+
+  .content_num {
+    --input-background-color: #f0f8f2;
+  }
 </style>

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

@@ -223,7 +223,9 @@
                     </div>
 
                     <div class="item ww33 rx-cc">
+                      <div v-if="isDetails">{{ it.taskName }}</div>
                       <el-select
+                      v-else
                         size="mini"
                         class="content_num"
                         filterable

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

@@ -123,8 +123,10 @@
           "
           :item="item"
           :list="item.semiProductList"
+       
         >
         </oneJobQualityBom>
+        {{ item.singleReport}}
 
           
 
@@ -335,6 +337,8 @@
                 });
               }
 
+
+                  
               if (this.taskObj.type == 6 && this.clientEnvironmentId == 3) {
                 obj.semiProductList = obj.pickOutInList;
               }

src/views/produce/components/produceOrder.vue

@@ -246,6 +246,7 @@
         });
       },
       handleSelectionChange(val) {
+        console.log(val,222)
         let initReportValue = val[0].singleReport;
         let allSame = true;