55

src/views/pick/pickApply/index.vue

@@ -1,133 +1,35 @@
 <template>
-  <div class="index_box">
-    <div class="content_box">
-      <Search></Search>
-
-      <ele-split-layout
-        space="0px"
-        width="45%"
-        :resizable="true"
-        :min-size="200"
-        :max-size="-200"
-        :left-style="{
-          background: 'rgba(185, 182, 229, .4)',
-          overflow: 'hidden',
-          width: '100%'
-        }"
-        :right-style="{ overflow: 'hidden' }"
-        :responsive="false"
-        style="height: calc(100vh - 70px - 50px - 40px)"
-      >
-        <div class="left_main">
-          <produceOrder
-            @workSelect="workSelect"
-            @rowClick="rowClick"
-          ></produceOrder>
-        </div>
-
-        <template v-slot:content>
-          <div class="right_main">
-            <pickDetails ref="pickListRef"></pickDetails>
-          </div>
-        </template>
-      </ele-split-layout>
-    </div>
-
-    <!--领料弹框 -->
-    <picking
-      v-if="pickingShow"
-      @close="pickingClose"
-      :workListIds="workListIds"
-    ></picking>
-  </div>
+ <div>
+  
+ </div>
 </template>
 
 <script>
-  import Search from '@/views/produce/components/search.vue';
 
-  import produceOrder from '@/views/produce/components/produceOrder.vue';
-
-
-  import picking from '@/views/produce/components/picking/index.vue';
-  import pickDetails from '@/views/produce/components/picking/details.vue';
 
 
 
 
   export default {
     components: {
-      Search,
-      produceOrder,
-
 
-      picking,
-      pickDetails,
 
 
     },
     data() {
       return {
-        loading: false,
-        operationType: null,
-        workListIds: [],
 
-        pickingShow: false,
 
       };
     },
 
     computed: {
-      taskObj() {
-        return this.$store.state.user.taskObj;
-      }
     },
 
     created() {
-      this.operationType = null;
-      this.workListIds = [];
+
     },
     methods: {
-      workSelect(data) {
-        this.workListIds = data;
-      },
-
-      footBtn(t) {
-        this.operationType = t;
-
-        if (
-          Object.keys(this.$store.state.user.taskObj).length === 0 &&
-          this.$store.state.user.taskObj.constructor === Object
-        ) {
-          this.$message.warning('请选择工序');
-          return false;
-        }
-        if (['pick', 'feed', 'job'].includes(t)) {
-          if (this.workListIds.length == 0) {
-            this.$message.warning('请选择工单列表');
-            return false;
-          }
-        }
-
-        if (t == 'pick') {
-          this.$nextTick(() => {
-            this.$refs.pickListRef.getList(this.workListIds);
-          });
-
-          this.pickingShow = true;
-        }
-
-        if (t == 'feed') {
-        }
-      },
-
-      pickingClose(val) {
-        if (val) {
-          this.$nextTick(() => {
-            this.$refs.pickListRef.getList(this.workListIds);
-          });
-        }
-        this.pickingShow = false;
-      }
     },
 
     mounted() {},
@@ -135,98 +37,3 @@
     destroyed() {}
   };
 </script>
-
-<style>
-  .new-ele-admin-tabs {
-    display: none !important;
-  }
-
-  .c_title {
-    color: #157a2c;
-    font-size: 18px;
-    font-weight: bold;
-  }
-
-  .tableZ_box {
-    border: 1px solid #e3e5e5;
-    margin: 6px 0;
-
-    &:last-child {
-      border-bottom: none;
-    }
-
-    .row {
-      width: 100%;
-      display: flex;
-    }
-
-    .col {
-      width: calc(100% / 5);
-      display: flex;
-      align-items: center;
-      min-width: 200px;
-      min-height: 32px;
-      border-bottom: 1px solid #e3e5e5;
-      border-right: 1px solid #e3e5e5;
-
-      &:last-child {
-        border-right: none;
-      }
-
-      .name {
-        display: flex;
-        align-items: center;
-        padding: 4px;
-        width: 80px;
-        height: 100%;
-        background-color: #d0e4d5;
-        color: #000;
-      }
-
-      .content {
-        padding: 4px 6px;
-        color: #000;
-      }
-    }
-
-    .pd6 {
-      padding: 0 6px;
-    }
-  }
-</style>
-<style lang="scss" scoped>
-  .index_box {
-    padding: 8px;
-    padding-bottom: 0px;
-    width: 100%;
-
-    min-width: 1280px !important;
-    height: calc(100vh - 100px);
-    overflow-x: auto;
-    /* 当内容超出宽度时，允许水平滚动 */
-    white-space: nowrap;
-    /* 防止内部文本换行，确保所有内容都在一行显示 */
-    scrollbar-width: thin;
-    /* 设置滚动条宽度（浏览器兼容性可能有所不同） */
-    scrollbar-color: #40a9ff transparent;
-    /* 设置滚动条颜色和轨道颜色（同样，浏览器兼容性） */
-  }
-
-
-  .left_main {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-around;
-    min-width: 640px;
-    height: calc((100vh - 70px - 50px - 40px - 12px));
-  }
-
-  .right_main {
-    min-width: 640px;
-    height: calc((100vh - 70px - 50px - 40px - 12px));
-    margin-top: 6px;
-    background: #f0f3f3;
-  }
-</style>

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

@@ -1,6 +1,7 @@
 <template>
   <div>
     <div class="title_box rx-bc mt6">
+ 
       <div class="name">报工信息({{ list.length || 0 }})个 </div>
 
       <div class="rx-bc"> </div>
@@ -49,23 +50,7 @@
       </el-table-column>
 
 
-      <el-table-column
-        v-if="singleReport == 1"
-        :label="
-          item.currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'
-        "
-        prop="weightUnit"
-      >
-        <template slot-scope="{ row, $index }">
-          <div v-if="item.currentTaskDiagram.isFirstTask == 1">
-            {{ row.extInfo.weight || 0 }} {{ row.extInfo.weightUnit }}</div
-          >
-          <div v-if="item.currentTaskDiagram.isFirstTask == 0">
-            {{ row.extInfo.newWeight || 0 }}
-            {{ row.extInfo.weightUnit }}</div
-          >
-        </template>
-      </el-table-column>
+
 
       <el-table-column v-if="singleReport == 1" label="刻码" prop="engrave">
         <template slot-scope="{ row, $index }">
@@ -97,6 +82,7 @@
         </template>
       </el-table-column>
 
+
       <el-table-column
         v-if="singleReport == 1 && deviceList.length > 0"
         width="140"
@@ -104,7 +90,7 @@
         prop="deviceId"
       >
         <template slot-scope="{ row, $index }">
-          <el-select
+          <!-- <el-select
             class="content_num"
             v-model="row.deviceId"
             filterable
@@ -115,11 +101,12 @@
             <el-option
               v-for="item in deviceList"
               :label="item.name + '-' + item.codeNumber"
-              :value="item.id"
-              :key="item.id"
+              :value="item.id || item.instanceId"
+              :key="item.id || item.instanceId"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          {{   row.deviceName || row.extInfo.deviceName }}
         </template>
       </el-table-column>
 
@@ -418,6 +405,7 @@
     getComputeParam,
     saveParam
   } from '@/api/produce/job';
+import { row } from 'mathjs';
 
   export default {
     name: 'semiProductJobBom',

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

@@ -177,7 +177,7 @@
         prop="deviceId"
       >
         <template slot-scope="{ row, $index }">
-          <el-select
+          <!-- <el-select
             class="content_num"
             v-model="row.deviceId"
             filterable
@@ -188,11 +188,12 @@
             <el-option
               v-for="item in deviceList"
               :label="item.name + '-' + item.codeNumber"
-              :value="item.id"
-              :key="item.id"
+              :value="item.id || item.instanceId"
+              :key="item.id || item.instanceId"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          {{   row.deviceName || row.extInfo.deviceName }}
         </template>
       </el-table-column>
 

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

@@ -408,6 +408,7 @@
                 turnover = turnover.concat(f);
               }
             });
+   
 
             this.$set(m, 'equipmentList', equipmentList);
             this.$set(m, 'turnover', turnover);

src/views/produce/components/picking/details.vue

@@ -20,6 +20,11 @@
           >详情</el-button
         >
       </template>
+
+      <template v-slot:status="{ row }">
+           <el-tag :type="row.status == '0' ?'danger' : 'success'  " effect="dark">{{ row.status == '0' ? '未领料' : row.status == '1' ? '已领料' : row.status == '2' ? '已出库' : ''  }}</el-tag>
+
+        </template>
     </ele-pro-table>
 
     <detailed
@@ -80,6 +85,13 @@
             align: 'center'
           },
 
+          {
+            prop: 'status',
+            slot: 'status',
+            label: '状态',
+            align: 'center'
+          },
+
           {
             prop: '',
             label: '操作',