新增领料详情

src/api/produce/picking.js

@@ -4,7 +4,7 @@ import request from '@/utils/request';
 
 // 领料保存
 export async function batchSave(data) {
-    const res = await request.post(`/pda/mes/pickorder/batchSave`, data);
+    const res = await request.post(`/mes/pickorder/pcBatchSave`, data);
     if (res.data.code == 0) {
       return res.data.data;
     }

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

@@ -38,20 +38,22 @@
           :need-page="false"
         >
           <template v-slot:toolbar>
-            <div class="c_title"> 领料单号： {{ item.code }} </div>
+            <div class="c_title"> 工单编号: {{ item.code }} </div>
           </template>
 
           <template v-slot:empty>
             <div class="empty">暂无领料数据</div>
           </template>
 
-          <template v-slot:index="{ row , $index}">
-            {{ $index}} <el-tag>{{ row.rootCategoryLevelName }}</el-tag>
+          <template v-slot:index="{ row, $index }">
+            {{ $index }} <el-tag>{{ row.rootCategoryLevelName }}</el-tag>
           </template>
 
           <template v-slot:demandQuantity="{ row }">
             {{ row.demandQuantity }} {{ row.unit }}
           </template>
+
+
         </ele-pro-table>
       </div>
     </el-dialog>
@@ -77,42 +79,64 @@
             columnKey: 'index',
             label: '序号',
             type: 'index',
-            width: 80,
+            width: 120,
             align: 'center',
             showOverflowTooltip: true,
-                slot: 'index'
+            slot: 'index'
           },
 
           {
             prop: 'categoryCode',
             label: '编码',
-            align: 'center'
+            align: 'center',
+ 
           },
 
           {
             prop: 'categoryName',
             label: '名称',
-            align: 'center'
+            align: 'center',
+     
           },
 
           {
             prop: 'demandQuantity',
             label: '数量',
             align: 'center',
-            slot: 'demandQuantity'
+            slot: 'demandQuantity',
+  
           },
 
           {
             prop: 'warehouseName',
             label: '领料仓库',
-            align: 'center'
+            align: 'center',
+   
           },
 
           {
             prop: 'warehouseLeaderName',
             label: '审核人',
+            align: 'center',
+  
+          },
+
+          {
+            prop: 'brandNo',
+            label: '牌号',
+            align: 'center'
+          },
+          {
+            prop: 'model',
+            label: '型号',
+            align: 'center'
+          },
+          {
+            prop: 'specification',
+            label: '规格',
             align: 'center'
           }
+      
         ];
       },
 
@@ -140,7 +164,6 @@
       });
 
       this.dataObj = obj;
-      // console.log(this.dataObj);
     }
   };
 </script>
@@ -151,4 +174,13 @@
       width: calc(100% / 3);
     }
   }
+
+  .tag_box{
+    span{
+      display: inline-block;
+      padding: 2px 4px;
+      background: #e6f7ff;
+      margin: 0 4px;
+    }
+  }
 </style>

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

@@ -63,13 +63,13 @@
             align: 'center'
           },
           {
-            prop: 'pickCode',
+            prop: 'code',
             label: '领料单编号',
             align: 'center'
           },
 
           {
-            prop: 'pickName',
+            prop: 'name',
             label: '领料单名称',
             align: 'center'
           },

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

@@ -8,21 +8,21 @@
     append-to-body
     width="80%"
   >
-  <el-form>
-    <el-row :gutter="24">
-      <el-col :span="6">
-        <el-form-item label="领料单编号" prop="pickCode" label-width="90px">
-          <el-input v-model="pickCode" disabled=""></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="6">
-        <el-form-item label="领料单名称" prop="pickName" label-width="90px">
-          <el-input v-model="pickName"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+    <el-form>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="领料单编号" prop="pickCode" label-width="90px">
+            <el-input v-model="pickCode" disabled=""></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="领料单名称" prop="pickName" label-width="90px">
+            <el-input v-model="pickName"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
     <div v-for="(item, idx) in workList" :key="idx">
       <el-form
         :ref="`formRef${idx}`"
@@ -73,9 +73,7 @@
             <el-table-column label="序号" type="index" width="120">
               <template slot-scope="{ row, $index }">
                 {{ $index }}
-                <el-tag type="warning">{{
-                  typeName[Number(row.rootCategoryLevelId)]
-                }}</el-tag>
+                <el-tag>{{ typeName[Number(row.rootCategoryLevelId)] }}</el-tag>
               </template>
             </el-table-column>
 
@@ -300,9 +298,13 @@
 
           this.workList.forEach((e, i) => {
             _i = i;
+            console.log(e.pickList);
             bol2 = e.pickList.every((y) => {
               name = y.name;
-              return Number(y.demandQuantity) > 0;
+              return (
+                Object.prototype.hasOwnProperty.call(y, 'demandQuantity') &&
+                Number(y.demandQuantity) > 0
+              );
             });
           });
 
@@ -317,13 +319,13 @@
         let _arr = [];
         _arr = this.workList.map((m) => {
           m.instanceList = [];
-          m.bomDetailDTOS = [];
+          m.bomDetailDTOSList = [];
           m.pickList.forEach((e) => {
             if (
               Object.prototype.hasOwnProperty.call(e, 'isBom') &&
               e.isBom == 1
             ) {
-              m.bomDetailDTOS.push(e);
+              m.bomDetailDTOSList.push(e);
             } else {
               m.instanceList.push(e);
             }
@@ -337,9 +339,15 @@
           };
         });
 
-        batchSave(_arr).then((res) => {
+        let param = {
+          allPickList: _arr,
+          pickName: this.pickName,
+          pickCode: this.pickCode
+        };
+
+        batchSave(param).then((res) => {
           this.$message.success('领料成功');
-          this.$emit('close', false);
+          this.$emit('close', true);
         });
       }
     },